diff --git a/src/00/z2ui5_cl_app_demo_00.clas.abap b/src/00/z2ui5_cl_app_demo_00.clas.abap
index 0f65bb71..66851308 100644
--- a/src/00/z2ui5_cl_app_demo_00.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_00.clas.abap
@@ -10,7 +10,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_00 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_00 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -33,7 +33,7 @@ CLASS z2ui5_cl_app_demo_00 IMPLEMENTATION.
     ENDCASE.
 
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory(
         )->shell( )->page(
         title = 'abap2UI5 - Demo Section'
         class = 'sapUiContentPadding sapUiResponsivePadding--content '
@@ -94,7 +94,7 @@ CLASS z2ui5_cl_app_demo_00 IMPLEMENTATION.
 *         )->button( text = 'Split App' press = client->_event( 'z2ui5_cl_app_demo_17' )
     ).
 
-    grid->simple_form( title = 'HowTo - Extension II' layout = 'ResponsiveGridLayout' )->content( 'form'
+    grid->simple_form( title = 'HowTo - Extension I' layout = 'ResponsiveGridLayout' )->content( 'form'
          )->button( text = 'Views - Normal, Generic, XML' press = client->_event( 'z2ui5_cl_app_demo_23' )
          )->button( text = 'Import UI5-XML-View' press = client->_event( 'z2ui5_cl_app_demo_31' )
          )->button( text = 'Custom Control' press = client->_event( 'z2ui5_cl_app_demo_37' )
diff --git a/src/00/z2ui5_cl_app_demo_00.clas.xml b/src/00/z2ui5_cl_app_demo_00.clas.xml
index f764cd1d..cdedf356 100644
--- a/src/00/z2ui5_cl_app_demo_00.clas.xml
+++ b/src/00/z2ui5_cl_app_demo_00.clas.xml
@@ -5,7 +5,7 @@
    <VSEOCLASS>
     <CLSNAME>Z2UI5_CL_APP_DEMO_00</CLSNAME>
     <LANGU>E</LANGU>
-    <DESCRIPT>start</DESCRIPT>
+    <DESCRIPT>demo section</DESCRIPT>
     <STATE>1</STATE>
     <CLSCCINCL>X</CLSCCINCL>
     <FIXPT>X</FIXPT>
diff --git a/src/00/z2ui5_cl_app_demo_01.clas.abap b/src/00/z2ui5_cl_app_demo_01.clas.abap
index 9fe5a3dd..369a9bd2 100644
--- a/src/00/z2ui5_cl_app_demo_01.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_01.clas.abap
@@ -14,7 +14,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_01 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_01 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -32,7 +32,7 @@ CLASS z2ui5_cl_app_demo_01 IMPLEMENTATION.
         client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack  ) ).
     ENDCASE.
 
-    client->set_next( VALUE #( xml_main = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    client->set_next( VALUE #( xml_main = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
                 title          = 'abap2UI5 - First Example'
                 navbuttonpress = client->_event( 'BACK' )
@@ -40,7 +40,7 @@ CLASS z2ui5_cl_app_demo_01 IMPLEMENTATION.
             )->header_content(
                 )->link(
                     text = 'Source_Code'
-                    href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                     target = '_blank'
             )->get_parent(
             )->simple_form( title = 'Form Title' editable = abap_true
diff --git a/src/00/z2ui5_cl_app_demo_02.clas.abap b/src/00/z2ui5_cl_app_demo_02.clas.abap
index b6cfc5cb..526111fc 100644
--- a/src/00/z2ui5_cl_app_demo_02.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_02.clas.abap
@@ -109,14 +109,14 @@ CLASS Z2UI5_CL_APP_DEMO_02 IMPLEMENTATION.
 
   METHOD z2ui5_on_rendering.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
             title          = 'abap2UI5 - Selection-Screen Example'
             navbuttonpress = client->_event( 'BACK' )
               shownavbutton = abap_true
             )->header_content(
                 )->link( text = 'Demo'    target = '_blank'    href = `https://twitter.com/OblomovDev/status/1628701535222865922`
-                )->link( text = 'Source_Code'  target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                )->link( text = 'Source_Code'  target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent( ).
 
     DATA(grid) = page->grid( 'L6 M12 S12'
diff --git a/src/00/z2ui5_cl_app_demo_03.clas.abap b/src/00/z2ui5_cl_app_demo_03.clas.abap
index e37c5b56..593bdd8c 100644
--- a/src/00/z2ui5_cl_app_demo_03.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_03.clas.abap
@@ -47,7 +47,7 @@ CLASS Z2UI5_CL_APP_DEMO_03 IMPLEMENTATION.
             client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
         ENDCASE.
 
-        DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                 title          = 'abap2UI5 - List'
                 navbuttonpress = client->_event( 'BACK' )
@@ -55,7 +55,7 @@ CLASS Z2UI5_CL_APP_DEMO_03 IMPLEMENTATION.
                 )->header_content(
                     )->link(
                         text = 'Source_Code'  target = '_blank'
-                        href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                        href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                 )->get_parent( ).
 
         page->list(
diff --git a/src/00/z2ui5_cl_app_demo_04.clas.abap b/src/00/z2ui5_cl_app_demo_04.clas.abap
index 0dec7b7c..8b88be03 100644
--- a/src/00/z2ui5_cl_app_demo_04.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_04.clas.abap
@@ -77,7 +77,7 @@ CLASS Z2UI5_CL_APP_DEMO_04 IMPLEMENTATION.
 
       WHEN 'MAIN'.
 
-        DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                 title          = 'abap2UI5 - Controller'
                 navbuttonpress = client->_event( 'BACK' )
@@ -85,7 +85,7 @@ CLASS Z2UI5_CL_APP_DEMO_04 IMPLEMENTATION.
                 )->header_content(
                     )->link(
                         text = 'Source_Code'
-                        href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                        href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                         target = '_blank'
                 )->get_parent( ).
 
@@ -110,7 +110,7 @@ CLASS Z2UI5_CL_APP_DEMO_04 IMPLEMENTATION.
 
       WHEN 'SECOND'.
 
-        page = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        page = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                 title          = 'abap2UI5 - Controller'
                 navbuttonpress = client->_event( 'BACK' )
diff --git a/src/00/z2ui5_cl_app_demo_05.clas.abap b/src/00/z2ui5_cl_app_demo_05.clas.abap
index ddf207df..b373f0f1 100644
--- a/src/00/z2ui5_cl_app_demo_05.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_05.clas.abap
@@ -91,7 +91,7 @@ CLASS Z2UI5_CL_APP_DEMO_05 IMPLEMENTATION.
 
         ENDCASE.
 
-        DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                     title          = 'abap2UI5 - Selection-Screen more Controls'
                     navbuttonpress = client->_event( 'BACK' )
@@ -99,7 +99,7 @@ CLASS Z2UI5_CL_APP_DEMO_05 IMPLEMENTATION.
                 )->header_content(
                     )->link(
                         text = 'Source_Code'  target = '_blank'
-                        href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                        href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                 )->get_parent( ).
 
         page->generic_tag(
diff --git a/src/00/z2ui5_cl_app_demo_06.clas.abap b/src/00/z2ui5_cl_app_demo_06.clas.abap
index 49c9c6c1..64d212f1 100644
--- a/src/00/z2ui5_cl_app_demo_06.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_06.clas.abap
@@ -73,7 +73,7 @@ CLASS Z2UI5_CL_APP_DEMO_06 IMPLEMENTATION.
     ENDCASE.
 
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
             title          = 'abap2UI5 - Scroll Container with Table and Toolbar'
             navbuttonpress = client->_event( 'BACK' )
@@ -81,7 +81,7 @@ CLASS Z2UI5_CL_APP_DEMO_06 IMPLEMENTATION.
             )->header_content(
                 )->link(
                     text = 'Source_Code'  target = '_blank'
-                    href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
         )->get_parent( ).
 
     page->simple_form( title = 'Form Title' editable = abap_true
diff --git a/src/00/z2ui5_cl_app_demo_07.clas.abap b/src/00/z2ui5_cl_app_demo_07.clas.abap
index 9fefea61..951d89a6 100644
--- a/src/00/z2ui5_cl_app_demo_07.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_07.clas.abap
@@ -60,7 +60,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_07 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -98,6 +98,7 @@ CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
 
   ENDMETHOD.
 
+
   METHOD ui5_on_init.
 
     app-view_main = 'INIT'.
@@ -150,7 +151,7 @@ CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
 
   METHOD ui5_render_view_init.
 
-    DATA(lo_view) = z2ui5_cl_xml_view_helper=>factory( VALUE #(
+    DATA(lo_view) = Z2UI5_CL_XML_VIEW=>factory( VALUE #(
          ( n = `xmlns:mvc` v = `sap.ui.core.mvc` )
          ( n = `xmlns:m` v = `sap.m` )
          ( n = `xmlns:z2ui5` v = `z2ui5` )
@@ -166,7 +167,7 @@ CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
        )->header_content( ns = 'm'
            )->toolbar_spacer( ns = 'm'
            )->link( ns = 'm' text = 'Demo'   target = '_blank'     href = 'https://twitter.com/OblomovDev/status/1638487600930357248'
-           )->link( ns = 'm'  target = '_blank' text = 'Source_Code' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+           )->link( ns = 'm'  target = '_blank' text = 'Source_Code' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
        )->get_parent( ).
 
     page->text( ns = 'm' text = 'Custom Control for File Upload is now loaded.'
@@ -181,14 +182,14 @@ CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
 
   METHOD ui5_render_view_main.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory(  )->shell( )->page(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory(  )->shell( )->page(
             title          = 'abap2UI5 - File Upload/Download'
             navbuttonpress = client->_event( 'BACK' )
             shownavbutton  = abap_true
         )->header_content(
             )->toolbar_spacer(
             )->link( text = 'Demo'        href = 'https://twitter.com/OblomovDev/status/1638487600930357248'
-            )->link( text = 'Source_Code' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+            )->link( text = 'Source_Code' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
         )->get_parent( ).
 
     page->zz_file_uploader(
@@ -240,7 +241,7 @@ CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
 
   METHOD ui5_render_popup_descr.
 
-    DATA(lo_popup) = z2ui5_cl_xml_view_helper=>factory_popup(
+    DATA(lo_popup) = Z2UI5_CL_XML_VIEW=>factory_popup(
               )->dialog(
                       title = 'Edit Description'
                       icon = 'sap-icon://edit'
@@ -267,7 +268,7 @@ CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
 
   METHOD ui5_render_popup_data.
 
-    DATA(lo_popup) = z2ui5_cl_xml_view_helper=>factory_popup(
+    DATA(lo_popup) = Z2UI5_CL_XML_VIEW=>factory_popup(
      )->dialog(
              stretch = abap_true
              title = 'Data:'
@@ -399,5 +400,4 @@ CLASS z2ui5_cl_app_demo_07 IMPLEMENTATION.
                          `            });` && |\n|  &&
                          `        });`.
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_08.clas.abap b/src/00/z2ui5_cl_app_demo_08.clas.abap
index 58bafa5d..fa9f95dd 100644
--- a/src/00/z2ui5_cl_app_demo_08.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_08.clas.abap
@@ -52,7 +52,7 @@ CLASS Z2UI5_CL_APP_DEMO_08 IMPLEMENTATION.
 
         ENDCASE.
 
-        DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                 title          = 'abap2UI5 - Messages'
                 navbuttonpress = client->_event( 'BACK' )
@@ -60,7 +60,7 @@ CLASS Z2UI5_CL_APP_DEMO_08 IMPLEMENTATION.
                 )->header_content(
                     )->link(
                         text = 'Source_Code'  target = '_blank'
-                        href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                        href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                 )->get_parent( ).
 
         IF check_strip_active = abap_true.
diff --git a/src/00/z2ui5_cl_app_demo_09.clas.abap b/src/00/z2ui5_cl_app_demo_09.clas.abap
index 689553a8..b6d1466b 100644
--- a/src/00/z2ui5_cl_app_demo_09.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_09.clas.abap
@@ -207,7 +207,7 @@ CLASS Z2UI5_CL_APP_DEMO_09 IMPLEMENTATION.
 
   METHOD z2ui5_on_rendering.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory(
         )->page(
             title          = 'abap2UI5 - Value Help Examples'
             navbuttonpress = client->_event( 'BACK' )
@@ -218,7 +218,7 @@ CLASS Z2UI5_CL_APP_DEMO_09 IMPLEMENTATION.
                     href = 'https://twitter.com/OblomovDev/status/1637470531136921600'
                 )->link(
                     text = 'Source_Code' target = '_blank'
-                    href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
         )->get_parent( ).
 
     DATA(form) = page->grid( 'L7 M7 S7'
@@ -277,12 +277,12 @@ CLASS Z2UI5_CL_APP_DEMO_09 IMPLEMENTATION.
                 enabled = abap_false
                 type    = 'Success' ).
 
-    DATA(popup) = z2ui5_cl_xml_view_helper=>factory( ).
+    DATA(popup) = Z2UI5_CL_XML_VIEW=>factory( ).
     CASE mv_view_popup.
 
       WHEN 'POPUP_TABLE_F4'.
 
-        popup = z2ui5_cl_xml_view_helper=>factory_popup(
+        popup = Z2UI5_CL_XML_VIEW=>factory_popup(
             )->dialog( 'abap2UI5 - F4 Value Help'
             )->table(
                     mode  = 'SingleSelectLeft'
@@ -309,7 +309,7 @@ CLASS Z2UI5_CL_APP_DEMO_09 IMPLEMENTATION.
 
       WHEN 'POPUP_TABLE_F4_CUSTOM'.
 
-        popup = z2ui5_cl_xml_view_helper=>factory_popup(
+        popup = Z2UI5_CL_XML_VIEW=>factory_popup(
             )->dialog( 'abap2UI5 - F4 Value Help' ).
 
         popup->simple_form(
diff --git a/src/00/z2ui5_cl_app_demo_10.clas.abap b/src/00/z2ui5_cl_app_demo_10.clas.abap
index 217cafbd..648fe407 100644
--- a/src/00/z2ui5_cl_app_demo_10.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_10.clas.abap
@@ -20,7 +20,7 @@ CLASS Z2UI5_CL_APP_DEMO_10 IMPLEMENTATION.
         client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
     ENDCASE.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory(
         )->page(
             title           = 'abap2UI5 - Demo Layout'
             navbuttonpress  = client->_event( 'BACK' )
@@ -35,7 +35,7 @@ CLASS Z2UI5_CL_APP_DEMO_10 IMPLEMENTATION.
         href = 'https://twitter.com/OblomovDev'
       )->link(
         text = 'Source_Code' target = '_blank'
-        href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+        href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
        ).
 
     page->sub_header(
diff --git a/src/00/z2ui5_cl_app_demo_11.clas.abap b/src/00/z2ui5_cl_app_demo_11.clas.abap
index 0102627b..6b999912 100644
--- a/src/00/z2ui5_cl_app_demo_11.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_11.clas.abap
@@ -60,7 +60,7 @@ CLASS Z2UI5_CL_APP_DEMO_11 IMPLEMENTATION.
 
         ENDCASE.
 
-        DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                     title          = 'abap2UI5 - Tables and editable'
                     navbuttonpress = client->_event( 'BACK' )
@@ -71,7 +71,7 @@ CLASS Z2UI5_CL_APP_DEMO_11 IMPLEMENTATION.
                         href = 'https://twitter.com/OblomovDev/status/1630240894581608448'
                     )->link(
                         text = 'Source_Code' target = '_blank'
-                        href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                        href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent( ).
 
         DATA(tab) = page->table(
diff --git a/src/00/z2ui5_cl_app_demo_12.clas.abap b/src/00/z2ui5_cl_app_demo_12.clas.abap
index fa3f8dbe..27d36492 100644
--- a/src/00/z2ui5_cl_app_demo_12.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_12.clas.abap
@@ -77,7 +77,7 @@ CLASS Z2UI5_CL_APP_DEMO_12 IMPLEMENTATION.
 
     ENDCASE.
 
-    DATA(lo_main) = z2ui5_cl_xml_view_helper=>factory( )->shell( ).
+    DATA(lo_main) = Z2UI5_CL_XML_VIEW=>factory( )->shell( ).
 
     CASE mv_main_view.
 
@@ -90,7 +90,7 @@ CLASS Z2UI5_CL_APP_DEMO_12 IMPLEMENTATION.
                 )->header_content(
                     )->link(
                         text = 'Source_Code' target = '_blank'
-                        href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                        href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                 )->get_parent( ).
 
         DATA(grid) = page->grid( 'L7 M12 S12' )->content( 'layout'
@@ -125,7 +125,7 @@ CLASS Z2UI5_CL_APP_DEMO_12 IMPLEMENTATION.
 
     ENDCASE.
 
-    DATA(lo_popup) = z2ui5_cl_xml_view_helper=>factory_popup( ).
+    DATA(lo_popup) = Z2UI5_CL_XML_VIEW=>factory_popup( ).
 
     CASE mv_popup_view.
 
diff --git a/src/00/z2ui5_cl_app_demo_13.clas.abap b/src/00/z2ui5_cl_app_demo_13.clas.abap
index 8a14c4a8..32edb3ef 100644
--- a/src/00/z2ui5_cl_app_demo_13.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_13.clas.abap
@@ -159,7 +159,7 @@ CLASS Z2UI5_CL_APP_DEMO_13 IMPLEMENTATION.
 
   METHOD z2ui5_on_render_view_edit.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
        )->page(
                title          = 'abap2ui5 - Table Maintenance'
                navbuttonpress = client->_event( 'BACK' )
@@ -170,7 +170,7 @@ CLASS Z2UI5_CL_APP_DEMO_13 IMPLEMENTATION.
                    href = `https://twitter.com/OblomovDev/status/1634206964291911682`
                )->link(
                    text = 'Source_Code' target = '_blank'
-                   href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                   href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
            )->get_parent(
            )->sub_header(
                )->overflow_toolbar(
@@ -247,7 +247,7 @@ CLASS Z2UI5_CL_APP_DEMO_13 IMPLEMENTATION.
 
   METHOD z2ui5_on_render_view_export.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory(  )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory(  )->shell(
     )->page(
             title          = 'abap2ui5 - Table Maintenance'
             navbuttonpress = client->_event( 'BACK' )
@@ -258,7 +258,7 @@ CLASS Z2UI5_CL_APP_DEMO_13 IMPLEMENTATION.
                 href = `https://twitter.com/OblomovDev/status/1634206964291911682`
             )->link(
                 text = 'Source_Code'
-                href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
         )->get_parent(
         )->sub_header(
             )->overflow_toolbar(
@@ -311,7 +311,7 @@ CLASS Z2UI5_CL_APP_DEMO_13 IMPLEMENTATION.
 
   METHOD z2ui5_on_render_view_import.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
     )->page(
             title          = 'abap2UI5 - Table Maintenance'
             navbuttonpress = client->_event( 'BACK' )
@@ -322,7 +322,7 @@ CLASS Z2UI5_CL_APP_DEMO_13 IMPLEMENTATION.
                 href = `https://twitter.com/OblomovDev/status/1634206964291911682`
             )->link(
                 text = 'Source_Code'
-                href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
         )->get_parent(
         )->sub_header(
             )->overflow_toolbar(
diff --git a/src/00/z2ui5_cl_app_demo_14.clas.abap b/src/00/z2ui5_cl_app_demo_14.clas.abap
index 4c5a8984..8af9ffa0 100644
--- a/src/00/z2ui5_cl_app_demo_14.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_14.clas.abap
@@ -51,13 +51,13 @@ CLASS Z2UI5_CL_APP_DEMO_14 IMPLEMENTATION.
             client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
         ENDCASE.
 
-        DATA(page) = z2ui5_cl_xml_view_helper=>factory(  )->shell( )->page(
+        DATA(page) = Z2UI5_CL_XML_VIEW=>factory(  )->shell( )->page(
         title = 'abap2UI5 - MIME Editor'
         navbuttonpress = client->_event( 'BACK' )
         shownavbutton = abap_true
                 )->header_content(
                     )->link( text = 'Demo'        target = '_blank' href = 'https://twitter.com/OblomovDev/status/1631562906570575875'
-                    )->link( text = 'Source_Code' target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    )->link( text = 'Source_Code' target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent( ).
 
         DATA(grid) = page->grid( 'L7 M12 S12' )->content( 'layout' ).
diff --git a/src/00/z2ui5_cl_app_demo_15.clas.abap b/src/00/z2ui5_cl_app_demo_15.clas.abap
index b4cc527c..ef8169f5 100644
--- a/src/00/z2ui5_cl_app_demo_15.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_15.clas.abap
@@ -34,14 +34,14 @@ CLASS Z2UI5_CL_APP_DEMO_15 IMPLEMENTATION.
 
         ENDCASE.
 
-        data(view) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        data(view) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
             title          = 'abap2UI5 - Formatted Text'
             navbuttonpress = client->_event( 'BACK' )
             shownavbutton  = abap_true
             )->header_content(
                 )->toolbar_spacer(
-                )->link( text = 'Source_Code'  target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                )->link( text = 'Source_Code'  target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent(
             )->vbox( 'sapUiSmallMargin'
                 )->link(
diff --git a/src/00/z2ui5_cl_app_demo_16.clas.abap b/src/00/z2ui5_cl_app_demo_16.clas.abap
index 3ab63681..40934d30 100644
--- a/src/00/z2ui5_cl_app_demo_16.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_16.clas.abap
@@ -31,22 +31,22 @@ CLASS z2ui5_cl_app_demo_16 DEFINITION PUBLIC.
     METHODS render_tab_bar
       IMPORTING
         client    TYPE REF TO z2ui5_if_client
-        container TYPE REF TO z2ui5_cl_xml_view_helper.
+        container TYPE REF TO Z2UI5_CL_XML_VIEW.
 
     METHODS render_tab_donut
       IMPORTING
         client    TYPE REF TO z2ui5_if_client
-        container TYPE REF TO z2ui5_cl_xml_view_helper.
+        container TYPE REF TO Z2UI5_CL_XML_VIEW.
 
     METHODS render_tab_line
       IMPORTING
         client    TYPE REF TO z2ui5_if_client
-        container TYPE REF TO z2ui5_cl_xml_view_helper.
+        container TYPE REF TO Z2UI5_CL_XML_VIEW.
 
     METHODS render_tab_radial
       IMPORTING
         client    TYPE REF TO z2ui5_if_client
-        container TYPE REF TO z2ui5_cl_xml_view_helper.
+        container TYPE REF TO Z2UI5_CL_XML_VIEW.
 
 
   PROTECTED SECTION.
@@ -364,14 +364,14 @@ CLASS Z2UI5_CL_APP_DEMO_16 IMPLEMENTATION.
         ENDCASE.
 
 
-        DATA(container) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        DATA(container) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                 title = 'abap2UI5 - Visualization'
                 navbuttonpress = client->_event( 'BACK' )
                 shownavbutton = abap_true
                 )->header_content(
                     )->link( text = 'Demo'        target = '_blank' href = `https://twitter.com/OblomovDev/status/1639191954285113344`
-                    )->link( text = 'Source_Code' target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    )->link( text = 'Source_Code' target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent(
             )->tab_container( ).
 
diff --git a/src/00/z2ui5_cl_app_demo_17.clas.abap b/src/00/z2ui5_cl_app_demo_17.clas.abap
index 4f2e1498..da2ec0a7 100644
--- a/src/00/z2ui5_cl_app_demo_17.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_17.clas.abap
@@ -38,7 +38,7 @@ CLASS Z2UI5_CL_APP_DEMO_17 IMPLEMENTATION.
 
         ENDCASE.
 
-        DATA(view) = z2ui5_cl_xml_view_helper=>factory( ).
+        DATA(view) = Z2UI5_CL_XML_VIEW=>factory( ).
 
 
         DATA(page) = view->object_page_layout(
diff --git a/src/00/z2ui5_cl_app_demo_18.clas.abap b/src/00/z2ui5_cl_app_demo_18.clas.abap
index ced566be..f0eb413b 100644
--- a/src/00/z2ui5_cl_app_demo_18.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_18.clas.abap
@@ -124,7 +124,7 @@ CLASS z2ui5_cl_app_demo_18 IMPLEMENTATION.
 
   METHOD z2ui5_render_view_main.
 
-    result = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    result = z2ui5_cl_xml_view=>factory( )->shell(
         )->page(
                 title          = 'abap2UI5 - Template'
                 navbuttonpress = client->_event( 'BACK' )
@@ -132,7 +132,7 @@ CLASS z2ui5_cl_app_demo_18 IMPLEMENTATION.
             )->header_content(
                 )->link(
                     text = 'Source_Code' target = '_blank'
-                    href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    href = z2ui5_cl_xml_view=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent(
             )->simple_form( title = 'VIEW_MAIN' editable = abap_true
                 )->content( 'form'
@@ -164,7 +164,7 @@ CLASS z2ui5_cl_app_demo_18 IMPLEMENTATION.
 
   METHOD z2ui5_render_view_second.
 
-    result = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    result = z2ui5_cl_xml_view=>factory( )->shell(
          )->page(
                  title          = 'abap2UI5 - Template'
                  navbuttonpress = client->_event( 'BACK' )
@@ -172,7 +172,7 @@ CLASS z2ui5_cl_app_demo_18 IMPLEMENTATION.
              )->header_content(
                  )->link(
                      text = 'Source_Code'
-                     href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                     href = z2ui5_cl_xml_view=>hlp_get_source_code_url( app = me get = client->get( ) )
              )->get_parent(
              )->simple_form( 'VIEW_SECOND'
                  )->content( 'form'
@@ -195,7 +195,7 @@ CLASS z2ui5_cl_app_demo_18 IMPLEMENTATION.
 
   METHOD z2ui5_render_popup_input.
 
-    result = z2ui5_cl_xml_view_helper=>factory_popup( )->dialog(
+    result = z2ui5_cl_xml_view=>factory_popup( )->dialog(
                       title = 'Title'
                       icon = 'sap-icon://edit'
                   )->content(
diff --git a/src/00/z2ui5_cl_app_demo_19.clas.abap b/src/00/z2ui5_cl_app_demo_19.clas.abap
index 5b5027be..43e20a79 100644
--- a/src/00/z2ui5_cl_app_demo_19.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_19.clas.abap
@@ -54,7 +54,7 @@ CLASS Z2UI5_CL_APP_DEMO_19 IMPLEMENTATION.
 
         ENDCASE.
 
-        DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                 title          = 'abap2UI5 - Table with different Selection Modes'
                 navbuttonpress = client->_event( 'BACK' )
@@ -65,7 +65,7 @@ CLASS Z2UI5_CL_APP_DEMO_19 IMPLEMENTATION.
                         href = 'https://twitter.com/OblomovDev/status/1637852441671528448'
                     )->link(
                         text = 'Source_Code' target = '_blank'
-                        href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                        href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                 )->get_parent( ).
 
         page->segmented_button(
diff --git a/src/00/z2ui5_cl_app_demo_20.clas.abap b/src/00/z2ui5_cl_app_demo_20.clas.abap
index b4526dc1..fefb8112 100644
--- a/src/00/z2ui5_cl_app_demo_20.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_20.clas.abap
@@ -62,7 +62,7 @@ CLASS Z2UI5_CL_APP_DEMO_20 IMPLEMENTATION.
 
     client->set_next( VALUE #(
         check_set_prev_view = mv_check_show_previous_view
-        xml_popup = z2ui5_cl_xml_view_helper=>factory_popup(
+        xml_popup = Z2UI5_CL_XML_VIEW=>factory_popup(
          )->dialog( 'abap2UI5 - Popup to decide'
                 )->vbox(
                     )->text( mv_text )->get_parent(
diff --git a/src/00/z2ui5_cl_app_demo_21.clas.abap b/src/00/z2ui5_cl_app_demo_21.clas.abap
index ec645e18..03913aef 100644
--- a/src/00/z2ui5_cl_app_demo_21.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_21.clas.abap
@@ -69,7 +69,7 @@ CLASS Z2UI5_CL_APP_DEMO_21 IMPLEMENTATION.
 
   METHOD view_main.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
                 title          = 'abap2UI5 - Popups'
                 navbuttonpress = client->_event( 'BACK' )
@@ -79,7 +79,7 @@ CLASS Z2UI5_CL_APP_DEMO_21 IMPLEMENTATION.
                     text = 'Demo' target = '_blank'
                     href = 'https://twitter.com/OblomovDev/status/1637163852264624139'
                 )->link(
-                    text = 'Source_Code' target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    text = 'Source_Code' target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
            )->get_parent( ).
 
     DATA(grid) = page->grid( 'L8 M12 S12' )->content( 'layout' ).
@@ -120,9 +120,10 @@ CLASS Z2UI5_CL_APP_DEMO_21 IMPLEMENTATION.
 
   ENDMETHOD.
 
+
   METHOD view_popup_decide.
 
-    DATA(popup) = z2ui5_cl_xml_view_helper=>factory_popup(
+    DATA(popup) = Z2UI5_CL_XML_VIEW=>factory_popup(
         )->dialog(
                 title = 'Title'
                 icon = 'sap-icon://question-mark'
@@ -147,7 +148,7 @@ CLASS Z2UI5_CL_APP_DEMO_21 IMPLEMENTATION.
 
   METHOD view_popup_input.
 
-    DATA(popup) = z2ui5_cl_xml_view_helper=>factory_popup(
+    DATA(popup) = Z2UI5_CL_XML_VIEW=>factory_popup(
        )->dialog(
        contentheight = '500px'
        contentwidth  = '500px'
@@ -181,7 +182,7 @@ CLASS Z2UI5_CL_APP_DEMO_21 IMPLEMENTATION.
 
   METHOD view_popup_table.
 
-    DATA(popup) = z2ui5_cl_xml_view_helper=>factory_popup(
+    DATA(popup) = Z2UI5_CL_XML_VIEW=>factory_popup(
        )->dialog( 'abap2UI5 - Popup to select entry'
            )->table(
                mode = 'SingleSelectLeft'
@@ -213,7 +214,7 @@ CLASS Z2UI5_CL_APP_DEMO_21 IMPLEMENTATION.
 
   METHOD view_popup_textarea.
 
-    DATA(popup) = z2ui5_cl_xml_view_helper=>factory_popup(
+    DATA(popup) = Z2UI5_CL_XML_VIEW=>factory_popup(
       )->dialog(
               stretch = mv_stretch_active
               title = 'Title'
@@ -241,7 +242,7 @@ CLASS Z2UI5_CL_APP_DEMO_21 IMPLEMENTATION.
 
   METHOD view_popup_textarea_size.
 
-    DATA(popup) = z2ui5_cl_xml_view_helper=>factory_popup(
+    DATA(popup) = Z2UI5_CL_XML_VIEW=>factory_popup(
        )->dialog(
                contentheight = '100px'
                contentwidth  = '1200px'
diff --git a/src/00/z2ui5_cl_app_demo_22.clas.abap b/src/00/z2ui5_cl_app_demo_22.clas.abap
index 99fc7192..16764fc6 100644
--- a/src/00/z2ui5_cl_app_demo_22.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_22.clas.abap
@@ -100,7 +100,7 @@ CLASS Z2UI5_CL_APP_DEMO_22 IMPLEMENTATION.
     ENDCASE.
 
 
-    DATA(view) = z2ui5_cl_xml_view_helper=>factory( )->shell( ).
+    DATA(view) = Z2UI5_CL_XML_VIEW=>factory( )->shell( ).
     DATA(page) = view->page(
         id = 'id_page'
         title = 'abap2ui5 - Scrolling and Cursor (use the browser Chrome to avoid incompatibilities)'
@@ -108,7 +108,7 @@ CLASS Z2UI5_CL_APP_DEMO_22 IMPLEMENTATION.
         shownavbutton = abap_true
         ).
 
-    page->header_content( )->link( text = 'Source_Code' target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) ) ).
+    page->header_content( )->link( text = 'Source_Code' target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) ).
 
 
     page->input(
diff --git a/src/00/z2ui5_cl_app_demo_23.clas.abap b/src/00/z2ui5_cl_app_demo_23.clas.abap
index b174303e..a71b41da 100644
--- a/src/00/z2ui5_cl_app_demo_23.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_23.clas.abap
@@ -27,7 +27,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_23 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_23 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -79,7 +79,7 @@ CLASS z2ui5_cl_app_demo_23 IMPLEMENTATION.
 
   METHOD z2ui5_on_render_main.
 
-    DATA(lo_view) = z2ui5_cl_xml_view_helper=>factory( ).
+    DATA(lo_view) = Z2UI5_CL_XML_VIEW=>factory( ).
 
     CASE app-view_main.
 
@@ -128,7 +128,7 @@ CLASS z2ui5_cl_app_demo_23 IMPLEMENTATION.
               )->header_content(
                   )->link(
                       text = 'Source_Code'
-                      href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                      href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                       target = '_blank'
               )->get_parent(
               )->simple_form( 'Form Title'
@@ -196,5 +196,4 @@ CLASS z2ui5_cl_app_demo_23 IMPLEMENTATION.
     ENDCASE.
 
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_24.clas.abap b/src/00/z2ui5_cl_app_demo_24.clas.abap
index d6b75dc4..2cb37dbc 100644
--- a/src/00/z2ui5_cl_app_demo_24.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_24.clas.abap
@@ -13,7 +13,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_24 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_24 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -53,11 +53,11 @@ CLASS z2ui5_cl_app_demo_24 IMPLEMENTATION.
     ENDCASE.
 
 
-    DATA(view) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(view) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page( title = 'abap2UI5 - flow logic - APP 01' navbuttonpress = client->_event( 'BACK' ) shownavbutton = abap_true
         )->header_content(
             )->link( text = 'Demo'        target = '_blank' href = `https://twitter.com/OblomovDev/status/1640743794206228480`
-            )->link( text = 'Source_Code' target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+            )->link( text = 'Source_Code' target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
         )->get_parent(
 
        )->grid( 'L6 M12 S12' )->content( 'layout'
diff --git a/src/00/z2ui5_cl_app_demo_25.clas.abap b/src/00/z2ui5_cl_app_demo_25.clas.abap
index 4a1328da..343224d4 100644
--- a/src/00/z2ui5_cl_app_demo_25.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_25.clas.abap
@@ -16,7 +16,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_25 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_25 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -64,13 +64,13 @@ CLASS z2ui5_cl_app_demo_25 IMPLEMENTATION.
 
       WHEN 'MAIN' OR ''.
 
-        DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
             )->page(
                    title          = 'abap2UI5 - flow logic - APP 02'
                    navbuttonpress = client->_event( 'BACK' ) shownavbutton = abap_true
                )->header_content(
                    )->link( text = 'Demo'        target = '_blank' href = `https://twitter.com/OblomovDev/status/1640743794206228480`
-                   )->link( text = 'Source_Code' target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                   )->link( text = 'Source_Code' target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                )->get_parent( ).
 
         page->grid( 'L6 M12 S12' )->content( 'layout'
@@ -90,13 +90,13 @@ CLASS z2ui5_cl_app_demo_25 IMPLEMENTATION.
 
       WHEN 'SECOND'.
 
-        page = z2ui5_cl_xml_view_helper=>factory(
+        page = Z2UI5_CL_XML_VIEW=>factory(
             )->page(
                     title          = 'abap2UI5 - flow logic - APP 02'
                     navbuttonpress = client->_event( 'BACK' ) shownavbutton = abap_true
                 )->header_content(
                     )->link( text = 'Demo'        href = `https://twitter.com/OblomovDev/status/1640743794206228480`
-                    )->link( text = 'Source_Code' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    )->link( text = 'Source_Code' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
                 )->get_parent( ).
 
         page->grid( 'L6 M12 S12' )->content( 'layout'
diff --git a/src/00/z2ui5_cl_app_demo_26.clas.abap b/src/00/z2ui5_cl_app_demo_26.clas.abap
index 698d0f7b..49fd7c74 100644
--- a/src/00/z2ui5_cl_app_demo_26.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_26.clas.abap
@@ -98,7 +98,7 @@ CLASS Z2UI5_CL_APP_DEMO_26 IMPLEMENTATION.
 
       WHEN 'VIEW_MAIN'.
 
-        app-s_next-xml_main = z2ui5_cl_xml_view_helper=>factory( )->shell(
+        app-s_next-xml_main = Z2UI5_CL_XML_VIEW=>factory( )->shell(
           )->page(
                   title          = 'abap2UI5 - Popover Examples'
                   navbuttonpress = client->_event( 'BACK' )
@@ -107,7 +107,7 @@ CLASS Z2UI5_CL_APP_DEMO_26 IMPLEMENTATION.
                   )->link( text = 'Demo' target = '_blank' href = `https://twitter.com/OblomovDev/status/1643899059839672321`
                   )->link(
                       text = 'Source_Code' target = '_blank'
-                      href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                      href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
               )->get_parent(
               )->simple_form( 'Popover'
                   )->content( 'form'
@@ -163,7 +163,7 @@ CLASS Z2UI5_CL_APP_DEMO_26 IMPLEMENTATION.
 
       WHEN 'POPOVER'.
 
-        app-s_next-xml_popup = z2ui5_cl_xml_view_helper=>factory_popup( )->popover(
+        app-s_next-xml_popup = Z2UI5_CL_XML_VIEW=>factory_popup( )->popover(
                     title     = 'Popover Title'
                     placement = mv_placement
                 )->footer( )->overflow_toolbar(
diff --git a/src/00/z2ui5_cl_app_demo_27.clas.abap b/src/00/z2ui5_cl_app_demo_27.clas.abap
index 5e2e6a6d..0dc46a21 100644
--- a/src/00/z2ui5_cl_app_demo_27.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_27.clas.abap
@@ -98,7 +98,7 @@ CLASS Z2UI5_CL_APP_DEMO_27 IMPLEMENTATION.
   METHOD z2ui5_on_render.
 
 
-    app-s_next-xml_main = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    app-s_next-xml_main = Z2UI5_CL_XML_VIEW=>factory( )->shell(
       )->page(
               title          = 'abap2UI5 - Binding Syntax'
               navbuttonpress = client->_event( 'BACK' )
@@ -106,7 +106,7 @@ CLASS Z2UI5_CL_APP_DEMO_27 IMPLEMENTATION.
           )->header_content(
               )->link(
                   text = 'Source_Code' target = '_blank'
-                  href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                  href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
           )->get_parent(
           )->simple_form( title = 'Binding Syntax' editable = abap_true
               )->content( 'form'
diff --git a/src/00/z2ui5_cl_app_demo_28.clas.abap b/src/00/z2ui5_cl_app_demo_28.clas.abap
index 8f072655..58e8963a 100644
--- a/src/00/z2ui5_cl_app_demo_28.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_28.clas.abap
@@ -37,7 +37,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_28 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_28 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -99,7 +99,7 @@ CLASS z2ui5_cl_app_demo_28 IMPLEMENTATION.
 
   METHOD z2ui5_on_render.
 
-    DATA(lo_view) = z2ui5_cl_xml_view_helper=>factory( )->shell( )->page(
+    DATA(lo_view) = Z2UI5_CL_XML_VIEW=>factory( )->shell( )->page(
              title          = 'abap2UI5 - CL_GUI_TIMER - Monitor'
              navbuttonpress = client->_event( 'BACK' )
              shownavbutton  = abap_true
@@ -107,7 +107,7 @@ CLASS z2ui5_cl_app_demo_28 IMPLEMENTATION.
              )->link( text = 'Demo'    target = '_blank'    href = `https://twitter.com/OblomovDev/status/1645816100813152256`
              )->link(
                  text = 'Source_Code' target = '_blank'
-                 href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                 href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
          )->get_parent(
           ).
 
@@ -123,5 +123,4 @@ CLASS z2ui5_cl_app_demo_28 IMPLEMENTATION.
     app-next-xml_main = lo_view->get_root( )->xml_get( ).
 
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_30.clas.abap b/src/00/z2ui5_cl_app_demo_30.clas.abap
index 2cdf4f0d..a15ea0a3 100644
--- a/src/00/z2ui5_cl_app_demo_30.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_30.clas.abap
@@ -22,7 +22,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_30 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_30 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -71,7 +71,7 @@ CLASS z2ui5_cl_app_demo_30 IMPLEMENTATION.
 
     ENDCASE.
 
-    DATA(view) = z2ui5_cl_xml_view_helper=>factory( ).
+    DATA(view) = Z2UI5_CL_XML_VIEW=>factory( ).
 
 
     DATA(page) = view->dynamic_page(
diff --git a/src/00/z2ui5_cl_app_demo_31.clas.abap b/src/00/z2ui5_cl_app_demo_31.clas.abap
index 53f0488d..09dc8e3c 100644
--- a/src/00/z2ui5_cl_app_demo_31.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_31.clas.abap
@@ -27,7 +27,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_31 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_31 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -87,7 +87,7 @@ CLASS z2ui5_cl_app_demo_31 IMPLEMENTATION.
                         `       <Input id="loadingMinSeconds" width="8rem" type="Number" description="seconds" value="` && client->_bind( mv_value ) && `"/>` && |\n|  &&
                         `       <Button text="BACK" type="Emphasized" press="` && client->_event( 'BACK') && `"/>` && |\n|  &&
                         `       <Link target="_blank" text="Demo" href="https://twitter.com/OblomovDev/status/1645104539387691008"/>` && |\n|  &&
-                        `       <Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                        `       <Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
                         `   </form:SimpleForm>  ` && |\n|  &&
                         `   <GenericTile class="sapUiTinyMarginBegin sapUiTinyMarginTop tileLayout" header="Country-Specific Profit Margin"  press="` && client->_event( 'POPUP' ) && `"` && |\n|  &&
                         `       frameType="OneByHalf" subheader="Subtitle">` && |\n|  &&
@@ -211,5 +211,4 @@ CLASS z2ui5_cl_app_demo_31 IMPLEMENTATION.
 
     endif.
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_32.clas.abap b/src/00/z2ui5_cl_app_demo_32.clas.abap
index b312cb93..cdac6020 100644
--- a/src/00/z2ui5_cl_app_demo_32.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_32.clas.abap
@@ -89,7 +89,7 @@ CLASS Z2UI5_CL_APP_DEMO_32 IMPLEMENTATION.
                           `  text="back" ` && |\n|  &&
                           `  press="` && client->_event( 'BACK' ) && `" ` && |\n|  &&
                           `  class="sapUiContentPadding sapUiResponsivePadding--content"/> ` && |\n|  &&
-                   `       <m:Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                   `       <m:Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
                           `<html><head><style>` && |\n|  &&
                           `body {background-color: powderblue;}` && |\n|  &&
                           `h1   {color: blue;}` && |\n|  &&
diff --git a/src/00/z2ui5_cl_app_demo_33.clas.abap b/src/00/z2ui5_cl_app_demo_33.clas.abap
index 7f4cafbb..e7702944 100644
--- a/src/00/z2ui5_cl_app_demo_33.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_33.clas.abap
@@ -10,7 +10,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_33 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_33 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -22,7 +22,7 @@ CLASS z2ui5_cl_app_demo_33 IMPLEMENTATION.
         client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
     ENDCASE.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
             title          = 'abap2UI5 - Messages'
             navbuttonpress = client->_event( 'BACK' )
@@ -30,7 +30,7 @@ CLASS z2ui5_cl_app_demo_33 IMPLEMENTATION.
             )->header_content(
                 )->link(
                     text = 'Source_Code'  target = '_blank'
-                    href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent( ).
 
     page->illustrated_message(
diff --git a/src/00/z2ui5_cl_app_demo_34.clas.abap b/src/00/z2ui5_cl_app_demo_34.clas.abap
index 6bcc815f..54a9c7ba 100644
--- a/src/00/z2ui5_cl_app_demo_34.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_34.clas.abap
@@ -25,9 +25,10 @@ ENDCLASS.
 
 CLASS Z2UI5_CL_APP_DEMO_34 IMPLEMENTATION.
 
+
   METHOD view_main.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
                 title          = 'abap2UI5 - Popups'
                 navbuttonpress = client->_event( 'BACK' )
@@ -37,7 +38,7 @@ CLASS Z2UI5_CL_APP_DEMO_34 IMPLEMENTATION.
              "       text = 'Demo' target = '_blank'
                "     href = 'https://twitter.com/OblomovDev/status/1637163852264624139'
                 )->link(
-                    text = 'Source_Code' target = '_blank' href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    text = 'Source_Code' target = '_blank' href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
            )->get_parent( ).
 
     DATA(grid) = page->grid( 'L8 M12 S12' )->content( 'layout' ).
@@ -56,7 +57,7 @@ CLASS Z2UI5_CL_APP_DEMO_34 IMPLEMENTATION.
 
   METHOD view_popup_bal.
 
-    DATA(popup) = z2ui5_cl_xml_view_helper=>factory_popup(
+    DATA(popup) = Z2UI5_CL_XML_VIEW=>factory_popup(
         )->dialog( 'abap2ui5 - Popup Message Log'
             )->table( client->_bind( t_bapiret )
                 )->columns(
@@ -88,6 +89,7 @@ CLASS Z2UI5_CL_APP_DEMO_34 IMPLEMENTATION.
 
   ENDMETHOD.
 
+
   METHOD z2ui5_if_app~controller.
 
     IF check_initialized = abap_false.
diff --git a/src/00/z2ui5_cl_app_demo_35.clas.abap b/src/00/z2ui5_cl_app_demo_35.clas.abap
index 28faac92..474132e5 100644
--- a/src/00/z2ui5_cl_app_demo_35.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_35.clas.abap
@@ -29,7 +29,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_35 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_35 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -139,14 +139,14 @@ CLASS z2ui5_cl_app_demo_35 IMPLEMENTATION.
 
   METHOD z2ui5_on_render.
 
-    DATA(lo_view) = z2ui5_cl_xml_view_helper=>factory( )->shell( )->page(
+    DATA(lo_view) = Z2UI5_CL_XML_VIEW=>factory( )->shell( )->page(
              title          = 'abap2UI5 - First Example'
              navbuttonpress = client->_event( 'BACK' )
              shownavbutton  = abap_true
          )->header_content(
              )->link(
                  text = 'Source_Code' target = '_blank'
-                 href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                 href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
          )->get_parent(
          )->simple_form( title = 'Form Title' editable = abap_true
              )->content( 'form'
@@ -186,5 +186,4 @@ FIELD-SYMBOLS <tab> type STANDARD TABLE.
     app-next-xml_main = lo_view->get_root( )->xml_get( ).
 
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_36.clas.abap b/src/00/z2ui5_cl_app_demo_36.clas.abap
index 1b34b4a5..67d3aad8 100644
--- a/src/00/z2ui5_cl_app_demo_36.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_36.clas.abap
@@ -89,7 +89,7 @@ CLASS Z2UI5_CL_APP_DEMO_36 IMPLEMENTATION.
                           `  text="back" ` && |\n|  &&
                           `  press="` && client->_event( 'BACK' ) && `" ` && |\n|  &&
                           `  class="sapUiContentPadding sapUiResponsivePadding--content"/> ` && |\n|  &&
-                   `       <m:Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                   `       <m:Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
                           `<html><head><style>` && |\n|  &&
                           `body {background-color: powderblue;}` && |\n|  &&
                           `h1   {color: blue;}` && |\n|  &&
diff --git a/src/00/z2ui5_cl_app_demo_37.clas.abap b/src/00/z2ui5_cl_app_demo_37.clas.abap
index 33b24dc1..7312fb23 100644
--- a/src/00/z2ui5_cl_app_demo_37.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_37.clas.abap
@@ -34,7 +34,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_37 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_37 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -101,7 +101,7 @@ CLASS z2ui5_cl_app_demo_37 IMPLEMENTATION.
                           `  text="back" ` && |\n|  &&
                           `  press="` && client->_event( 'BACK' ) && `" ` && |\n|  &&
                           `  class="sapUiContentPadding sapUiResponsivePadding--content"/> ` && |\n|  &&
-                   `       <m:Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                   `       <m:Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
                           `<m:Button text="Load Custom Control"    press="` && client->_event( 'LOAD_CC' )    && `" />` && |\n|  &&
                           `<m:Button text="Display Custom Control" press="` && client->_event( 'DISPLAY_CC' ) && `" />` && |\n|  &&
                           `<html><head> ` &&
@@ -125,6 +125,7 @@ CLASS z2ui5_cl_app_demo_37 IMPLEMENTATION.
 
   ENDMETHOD.
 
+
   METHOD get_js_custom_control.
 
     result = `<script>if(!z2ui5.MyCC){ jQuery.sap.declare("z2ui5.MyCC");` && |\n|  &&
diff --git a/src/00/z2ui5_cl_app_demo_38.clas.abap b/src/00/z2ui5_cl_app_demo_38.clas.abap
index db8a7f5b..bad98af3 100644
--- a/src/00/z2ui5_cl_app_demo_38.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_38.clas.abap
@@ -44,7 +44,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_38 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_38 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -85,7 +85,7 @@ CLASS z2ui5_cl_app_demo_38 IMPLEMENTATION.
         client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
     ENDCASE.
 
-    DATA(page) = z2ui5_cl_xml_view_helper=>factory( )->shell(
+    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
             title          = 'abap2UI5 - List'
             navbuttonpress = client->_event( 'BACK' )
@@ -93,7 +93,7 @@ CLASS z2ui5_cl_app_demo_38 IMPLEMENTATION.
             )->header_content(
                 )->link(
                     text = 'Source_Code'  target = '_blank'
-                    href = z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent( ).
     page->button( text = 'Messages' press = client->_event( 'MESSAGES' ) ).
     page->message_view(
@@ -118,7 +118,7 @@ CLASS z2ui5_cl_app_demo_38 IMPLEMENTATION.
     app-next-xml_main = page->get_root(  )->xml_get( ).
 
 
-   " data(popup) = z2ui5_cl_xml_view_helper=>factory_popup( )->
+   " data(popup) = Z2UI5_CL_XML_VIEW=>factory_popup( )->
 
 
     "set the data for the frontend
diff --git a/src/00/z2ui5_cl_app_demo_40.clas.abap b/src/00/z2ui5_cl_app_demo_40.clas.abap
index 9fb2014b..96a89956 100644
--- a/src/00/z2ui5_cl_app_demo_40.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_40.clas.abap
@@ -27,7 +27,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_app_demo_40 IMPLEMENTATION.
+CLASS Z2UI5_CL_APP_DEMO_40 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -64,6 +64,7 @@ CLASS z2ui5_cl_app_demo_40 IMPLEMENTATION.
 
   ENDMETHOD.
 
+
   METHOD z2ui5_on_render.
 
     app-next-xml_main = `<mvc:View controllerName="project1.controller.View1"` && |\n|  &&
@@ -73,7 +74,7 @@ CLASS z2ui5_cl_app_demo_40 IMPLEMENTATION.
                           `  text="back" ` && |\n|  &&
                           `  press="` && client->_event( 'BACK' ) && `" ` && |\n|  &&
                           `  class="sapUiContentPadding sapUiResponsivePadding--content"/> ` && |\n|  &&
-                   `       <m:Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view_helper=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                   `       <m:Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
 
                           `<html><head>` && |\n|  &&
                           `</head>` && |\n|  &&
@@ -99,5 +100,4 @@ CLASS z2ui5_cl_app_demo_40 IMPLEMENTATION.
              `</mvc:View>`.
 
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_xml_view_helper.clas.abap b/src/00/z2ui5_cl_xml_view.clas.abap
similarity index 87%
rename from src/00/z2ui5_cl_xml_view_helper.clas.abap
rename to src/00/z2ui5_cl_xml_view.clas.abap
index eb0425e0..6a763cf8 100644
--- a/src/00/z2ui5_cl_xml_view_helper.clas.abap
+++ b/src/00/z2ui5_cl_xml_view.clas.abap
@@ -1,4 +1,4 @@
-CLASS z2ui5_cl_xml_view_helper DEFINITION
+CLASS z2ui5_cl_xml_view DEFINITION
   PUBLIC
   FINAL
   CREATE PROTECTED.
@@ -16,22 +16,22 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
     DATA m_ns    TYPE string.
     DATA mt_prop TYPE ty_t_name_value.
 
-    DATA m_root    TYPE REF TO z2ui5_cl_xml_view_helper.
-    DATA m_last    TYPE REF TO z2ui5_cl_xml_view_helper.
-    DATA m_parent  TYPE REF TO z2ui5_cl_xml_view_helper.
-    DATA t_child TYPE STANDARD TABLE OF REF TO z2ui5_cl_xml_view_helper WITH EMPTY KEY.
+    DATA m_root    TYPE REF TO z2ui5_cl_xml_view.
+    DATA m_last    TYPE REF TO z2ui5_cl_xml_view.
+    DATA m_parent  TYPE REF TO z2ui5_cl_xml_view.
+    DATA t_child TYPE STANDARD TABLE OF REF TO z2ui5_cl_xml_view WITH EMPTY KEY.
 
     CLASS-METHODS factory
       IMPORTING
         t_ns          TYPE ty_t_name_value OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     CLASS-METHODS factory_popup
       IMPORTING
         t_ns          TYPE ty_t_name_value OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     CLASS-METHODS hlp_get_source_code_url
       IMPORTING
@@ -47,35 +47,35 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         class         TYPE clike OPTIONAL
         width         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS Dynamic_Page
       IMPORTING
         headerExpanded           TYPE clike OPTIONAL
         toggleHeaderOnTitleClick TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)            TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)            TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS Dynamic_Page_Title
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS Dynamic_Page_Header
       IMPORTING
         pinnable      TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS Illustrated_Message
       IMPORTING
         enableVerticalResponsiveness TYPE clike OPTIONAL
         illustrationType             TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)                TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)                TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS additional_Content
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS flex_box
       IMPORTING
@@ -88,7 +88,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         justifycontent TYPE clike OPTIONAL
         wrap           TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS popover
       IMPORTING
@@ -97,14 +97,14 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         placement     TYPE clike OPTIONAL
         initialFocus  TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS list_item
       IMPORTING
         text           TYPE clike OPTIONAL
         additionaltext TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS table
       IMPORTING
@@ -118,7 +118,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         width               TYPE clike OPTIONAL
           PREFERRED PARAMETER items
       RETURNING
-        VALUE(result)       TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)       TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS message_strip
       IMPORTING
@@ -128,11 +128,11 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         class         TYPE clike OPTIONAL
           PREFERRED PARAMETER text
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS footer
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS message_page
       IMPORTING
@@ -142,7 +142,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         description         TYPE clike OPTIONAL
         icon                TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)       TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)       TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS object_page_layout
       IMPORTING
@@ -151,49 +151,49 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         editHeaderButtonPress    TYPE clike OPTIONAL
         upperCaseAnchorBar       TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)            TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)            TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS Object_Page_Dyn_Header_Title
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS expanded_heading
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS snapped_heading
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS expanded_content
       IMPORTING
         ns            TYPE clike DEFAULT `uxap`
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS snapped_content
       IMPORTING
         ns            TYPE clike DEFAULT `uxap`
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS snapped_Title_On_Mobile
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS header
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS navigation_actions
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS actions
       IMPORTING
         ns            TYPE clike DEFAULT `uxap`
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS avatar
       IMPORTING
@@ -201,15 +201,15 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         class         TYPE clike OPTIONAL
         displaysize   TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS header_title
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS sections
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS Object_Page_Section
       IMPORTING
@@ -218,39 +218,39 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         importance     TYPE clike OPTIONAL
         id             TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS heading
       IMPORTING
         ns            TYPE clike DEFAULT `uxap`
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS sub_sections
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS Object_page_Sub_Section
       IMPORTING
         id            TYPE clike OPTIONAL
         title         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS shell
       IMPORTING
         ns            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
     METHODS blocks
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS layout_data
       IMPORTING
         ns            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS flex_item_data
       IMPORTING
@@ -259,7 +259,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         backgrounddesign TYPE clike OPTIONAL
         styleclass       TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)    TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)    TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS code_editor
       IMPORTING
@@ -269,18 +269,18 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         width         TYPE clike OPTIONAL
         editable      TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS suggestion_items
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS vertical_layout
       IMPORTING
         class         TYPE clike OPTIONAL
         width         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS multi_input
       IMPORTING
@@ -290,11 +290,11 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         width           TYPE clike OPTIONAL
         tokens          TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)   TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)   TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS tokens
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS token
       IMPORTING
@@ -303,7 +303,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         selected      TYPE clike OPTIONAL
         visible       TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS input
       IMPORTING
@@ -323,7 +323,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         valuehelprequest TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
-        VALUE(result)    TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)    TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS dialog
       IMPORTING
@@ -335,43 +335,43 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         contentwidth  TYPE clike OPTIONAL
           PREFERRED PARAMETER title
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS buttons
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS get_root
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS get_parent
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS get
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS get_child
       IMPORTING
         index         TYPE i DEFAULT 1
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS columns
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS column
       IMPORTING
         width         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS items
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS interact_donut_chart
       IMPORTING
@@ -382,11 +382,11 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         displayedsegments TYPE clike OPTIONAL
         press             TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)     TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)     TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS segments
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS interact_donut_chart_segment
       IMPORTING
@@ -395,7 +395,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         displayedvalue TYPE clike OPTIONAL
         selected       TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS interact_bar_chart
       IMPORTING
@@ -406,11 +406,11 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         errormessagetitle TYPE clike OPTIONAL
         showerror         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)     TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)     TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS bars
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS interact_bar_chart_bar
       IMPORTING
@@ -419,7 +419,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         displayedvalue TYPE clike OPTIONAL
         selected       TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS interact_line_chart
       IMPORTING
@@ -431,11 +431,11 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         errormessagetitle TYPE clike OPTIONAL
         showerror         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)     TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)     TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS points
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS interact_line_chart_point
       IMPORTING
@@ -445,7 +445,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         displayedvalue TYPE clike OPTIONAL
         selected       TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS radial_micro_chart
       IMPORTING
@@ -454,32 +454,32 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         press         TYPE clike OPTIONAL
         valuecolor    TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS column_list_item
       IMPORTING
         valign        TYPE clike OPTIONAL
         selected      TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS cells
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS header_content
       IMPORTING
         ns            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS sub_header
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS custom_data
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS badge_custom_data
       IMPORTING
@@ -487,7 +487,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         value         TYPE clike OPTIONAL
         visible       TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS toggle_button
       IMPORTING
@@ -498,7 +498,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         press         TYPE clike OPTIONAL
         class         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS button
       IMPORTING
@@ -511,21 +511,21 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         id            TYPE clike OPTIONAL
         ns            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
    METHODS message_view
       IMPORTING
         items          TYPE clike OPTIONAL
         groupItems     type clike optional
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
    METHODS message_popover
       IMPORTING
         items          TYPE clike OPTIONAL
         groupItems     type clike optional
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
    METHODS message_item
       IMPORTING
@@ -535,7 +535,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         description    TYPE clike OPTIONAL
         groupName      TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS page
       IMPORTING
@@ -547,7 +547,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         ns             TYPE clike OPTIONAL
           PREFERRED PARAMETER title
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS vbox
       IMPORTING
@@ -555,13 +555,13 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         class         TYPE clike OPTIONAL
           PREFERRED PARAMETER class
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS hbox
       IMPORTING
         class         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS scroll_container
       IMPORTING
@@ -572,7 +572,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         focusable     TYPE clike OPTIONAL
           PREFERRED PARAMETER height
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS simple_form
       IMPORTING
@@ -581,19 +581,19 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         editable      TYPE clike OPTIONAL
           PREFERRED PARAMETER title
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS zz_plain
       IMPORTING
         val           TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS content
       IMPORTING
         ns            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS title
       IMPORTING
@@ -602,22 +602,22 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         wrapping      TYPE clike OPTIONAL
           PREFERRED PARAMETER text
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS tab_container
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS tab
       IMPORTING
         text          TYPE clike OPTIONAL
         selected      TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS overflow_toolbar
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS overflow_toolbar_button
       IMPORTING
@@ -628,25 +628,25 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         press         TYPE clike OPTIONAL
         tooltip       TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS toolbar_spacer
       IMPORTING
         ns            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS label
       IMPORTING
         text          TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS image
       IMPORTING
         src           TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS date_picker
       IMPORTING
@@ -654,7 +654,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         placeholder   TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS time_picker
       IMPORTING
@@ -662,7 +662,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         placeholder   TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS date_time_picker
       IMPORTING
@@ -670,7 +670,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         placeholder   TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS link
       IMPORTING
@@ -680,14 +680,14 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         enabled       TYPE clike OPTIONAL
         ns            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS list
       IMPORTING
         headertext    TYPE clike OPTIONAL
         items         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS standard_list_item
       IMPORTING
@@ -697,14 +697,14 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         info          TYPE clike OPTIONAL
         press         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS item
       IMPORTING
         key           TYPE clike OPTIONAL
         text          TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS segmented_button_item
       IMPORTING
@@ -712,7 +712,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         key           TYPE clike OPTIONAL
         text          TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS combobox
       IMPORTING
@@ -721,7 +721,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         label         TYPE clike OPTIONAL
         items         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS grid
       IMPORTING
@@ -729,14 +729,14 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         default_span  TYPE clike OPTIONAL
           PREFERRED PARAMETER default_span
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS grid_data
       IMPORTING
         span          TYPE clike OPTIONAL
           PREFERRED PARAMETER span
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS text_area
       IMPORTING
@@ -751,7 +751,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         id              TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
-        VALUE(result)   TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result)   TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS range_slider
       IMPORTING
@@ -766,7 +766,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         class         TYPE clike OPTIONAL
         id            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS generic_tag
       IMPORTING
@@ -776,14 +776,14 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         status         TYPE clike OPTIONAL
         class          TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS object_attribute
       IMPORTING
         title         TYPE clike OPTIONAL
         text          TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS object_number
       IMPORTING
@@ -792,7 +792,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         number        TYPE clike OPTIONAL
         unit          TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS switch
       IMPORTING
@@ -802,7 +802,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         enabled       TYPE clike OPTIONAL
         type          TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS step_input
       IMPORTING
@@ -811,7 +811,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         max           TYPE clike
         step          TYPE clike
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS progress_indicator
       IMPORTING
@@ -820,14 +820,14 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         showvalue     TYPE clike OPTIONAL
         state         TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS segmented_button
       IMPORTING
         selected_key     TYPE clike
         selection_change TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)    TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result)    TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS checkbox
       IMPORTING
@@ -836,11 +836,11 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         enabled       TYPE clike OPTIONAL
           PREFERRED PARAMETER selected
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS header_toolbar
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS text
       IMPORTING
@@ -849,13 +849,13 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         ns            TYPE clike OPTIONAL
           PREFERRED PARAMETER text
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS formatted_text
       IMPORTING
         htmltext      TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS _generic
       IMPORTING
@@ -863,7 +863,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         ns            TYPE clike OPTIONAL
         t_prop        TYPE ty_t_name_value OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS zz_file_uploader
       IMPORTING
@@ -872,7 +872,7 @@ CLASS z2ui5_cl_xml_view_helper DEFINITION
         placeholder   TYPE clike OPTIONAL
         upload        TYPE clike OPTIONAL
       RETURNING
-        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view_helper.
+        VALUE(result) TYPE REF TO  z2ui5_cl_xml_view.
 
     METHODS xml_get
       RETURNING
@@ -885,7 +885,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_xml_view_helper IMPLEMENTATION.
+CLASS z2ui5_cl_xml_view IMPLEMENTATION.
 
   METHOD constructor.
 
@@ -2197,7 +2197,7 @@ CLASS z2ui5_cl_xml_view_helper IMPLEMENTATION.
     result = |{ result }>|.
 
     LOOP AT t_child INTO DATA(lr_child).
-      result = result && CAST z2ui5_cl_xml_view_helper( lr_child )->xml_get( ).
+      result = result && CAST z2ui5_cl_xml_view( lr_child )->xml_get( ).
     ENDLOOP.
 
     DATA(lv_ns) = COND #( WHEN m_ns <> || THEN |{ m_ns }:| ).
@@ -2223,7 +2223,7 @@ CLASS z2ui5_cl_xml_view_helper IMPLEMENTATION.
 
   METHOD _generic.
 
-    DATA(result2) = NEW z2ui5_cl_xml_view_helper( ).
+    DATA(result2) = NEW z2ui5_cl_xml_view( ).
     result2->m_name = name.
     result2->m_ns = ns.
     result2->mt_prop = t_prop.
diff --git a/src/00/z2ui5_cl_xml_view_helper.clas.locals_imp.abap b/src/00/z2ui5_cl_xml_view.clas.locals_imp.abap
similarity index 100%
rename from src/00/z2ui5_cl_xml_view_helper.clas.locals_imp.abap
rename to src/00/z2ui5_cl_xml_view.clas.locals_imp.abap
diff --git a/src/00/z2ui5_cl_xml_view_helper.clas.xml b/src/00/z2ui5_cl_xml_view.clas.xml
similarity index 79%
rename from src/00/z2ui5_cl_xml_view_helper.clas.xml
rename to src/00/z2ui5_cl_xml_view.clas.xml
index 0437da9a..eb1a3c60 100644
--- a/src/00/z2ui5_cl_xml_view_helper.clas.xml
+++ b/src/00/z2ui5_cl_xml_view.clas.xml
@@ -3,9 +3,9 @@
  <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
   <asx:values>
    <VSEOCLASS>
-    <CLSNAME>Z2UI5_CL_XML_VIEW_HELPER</CLSNAME>
+    <CLSNAME>Z2UI5_CL_XML_VIEW</CLSNAME>
     <LANGU>E</LANGU>
-    <DESCRIPT>abap2UI5 - xml view helper</DESCRIPT>
+    <DESCRIPT>abap2UI5 - xml view parser</DESCRIPT>
     <STATE>1</STATE>
     <CLSCCINCL>X</CLSCCINCL>
     <FIXPT>X</FIXPT>