diff --git a/src/zabapgit.prog.abap b/src/zabapgit.prog.abap
index 6068c745d..e22ccb5a7 100644
--- a/src/zabapgit.prog.abap
+++ b/src/zabapgit.prog.abap
@@ -3,7 +3,7 @@ REPORT zabapgit LINE-SIZE 100.
 * See http://www.abapgit.org
 
 CONSTANTS: gc_xml_version  TYPE string VALUE 'v1.0.0',      "#EC NOTEXT
-           gc_abap_version TYPE string VALUE 'v1.15.3'.     "#EC NOTEXT
+           gc_abap_version TYPE string VALUE 'v1.15.4'.     "#EC NOTEXT
 
 ********************************************************************************
 * The MIT License (MIT)
diff --git a/src/zabapgit_object.prog.abap b/src/zabapgit_object.prog.abap
index ce173e81f..be857cdd2 100644
--- a/src/zabapgit_object.prog.abap
+++ b/src/zabapgit_object.prog.abap
@@ -1972,9 +1972,10 @@ CLASS lcl_object_fugr IMPLEMENTATION.
 
   METHOD lif_object~deserialize.
 
-    DATA: lt_functions TYPE ty_function_tt,
-          lt_dynpros   TYPE ty_dynpro_tt,
-          ls_cua       TYPE ty_cua.
+    DATA: lv_program_name TYPE programm,
+          lt_functions    TYPE ty_function_tt,
+          lt_dynpros      TYPE ty_dynpro_tt,
+          ls_cua          TYPE ty_cua.
 
 
     deserialize_xml(
@@ -1989,13 +1990,16 @@ CLASS lcl_object_fugr IMPLEMENTATION.
       io_xml     = io_xml
       iv_package = iv_package ).
 
+    lv_program_name = main_name( ).
+
     io_xml->read( EXPORTING iv_name = 'DYNPROS'
                   CHANGING cg_data = lt_dynpros ).
-    deserialize_dynpros( lt_dynpros ).
+    deserialize_dynpros( it_dynpros = lt_dynpros ).
 
     io_xml->read( EXPORTING iv_name = 'CUA'
                   CHANGING cg_data = ls_cua ).
-    deserialize_cua( ls_cua ).
+    deserialize_cua( iv_program_name = lv_program_name
+                     is_cua = ls_cua ).
 
   ENDMETHOD.                    "deserialize
 
@@ -2151,13 +2155,15 @@ CLASS lcl_object_prog IMPLEMENTATION.
 
   METHOD lif_object~deserialize.
 
-    DATA: ls_progdir   TYPE ty_progdir,
-          lt_tpool     TYPE textpool_table,
-          lt_dynpros   TYPE ty_dynpro_tt,
-          lt_tpool_ext TYPE ty_tpool_tt,
-          ls_cua       TYPE ty_cua,
-          lt_source    TYPE abaptxt255_tab.
+    DATA: lv_program_name TYPE programm,
+          ls_progdir      TYPE ty_progdir,
+          lt_tpool        TYPE textpool_table,
+          lt_dynpros      TYPE ty_dynpro_tt,
+          lt_tpool_ext    TYPE ty_tpool_tt,
+          ls_cua          TYPE ty_cua,
+          lt_source       TYPE abaptxt255_tab.
 
+    lv_program_name = ms_item-obj_name.
 
     lt_source = mo_files->read_abap( ).
 
@@ -2174,11 +2180,12 @@ CLASS lcl_object_prog IMPLEMENTATION.
 
     io_xml->read( EXPORTING iv_name = 'DYNPROS'
                   CHANGING cg_data = lt_dynpros ).
-    deserialize_dynpros( lt_dynpros ).
+    deserialize_dynpros( it_dynpros = lt_dynpros ).
 
     io_xml->read( EXPORTING iv_name = 'CUA'
                   CHANGING cg_data = ls_cua ).
-    deserialize_cua( ls_cua ).
+    deserialize_cua( iv_program_name = lv_program_name
+                     is_cua = ls_cua ).
 
     deserialize_textpool( lt_tpool ).
 
diff --git a/src/zabapgit_objects.prog.abap b/src/zabapgit_objects.prog.abap
index 88f5f7676..2839abca0 100644
--- a/src/zabapgit_objects.prog.abap
+++ b/src/zabapgit_objects.prog.abap
@@ -750,7 +750,8 @@ CLASS lcl_objects_program DEFINITION INHERITING FROM lcl_objects_super.
       RAISING   lcx_exception.
 
     METHODS deserialize_cua
-      IMPORTING is_cua TYPE ty_cua
+      IMPORTING iv_program_name TYPE programm
+                is_cua TYPE ty_cua
       RAISING   lcx_exception.
 
     CLASS-METHODS:
@@ -1255,7 +1256,7 @@ CLASS lcl_objects_program IMPLEMENTATION.
     ENDIF.
 
     ls_tr_key-obj_type = ms_item-obj_type.
-    ls_tr_key-obj_name = ms_item-obj_name.
+    ls_tr_key-obj_name = iv_program_name.
     ls_tr_key-sub_type = 'CUAD'.
     ls_tr_key-sub_name = ms_item-obj_name.