diff --git a/src/syntax/zcl_abapgit_syntax_highlighter.clas.testclasses.abap b/src/syntax/zcl_abapgit_syntax_highlighter.clas.testclasses.abap
index 1b29d1bfc..11a3b9745 100644
--- a/src/syntax/zcl_abapgit_syntax_highlighter.clas.testclasses.abap
+++ b/src/syntax/zcl_abapgit_syntax_highlighter.clas.testclasses.abap
@@ -530,7 +530,7 @@ CLASS ltcl_syntax_basic_logic DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS
 
   PRIVATE SECTION.
 
-    DATA mo TYPE REF TO zcl_abapgit_syntax_highlighter.
+    DATA mo_syntax_highlighter TYPE REF TO zcl_abapgit_syntax_highlighter.
 
     METHODS:
       setup,
@@ -546,7 +546,7 @@ ENDCLASS.
 CLASS ltcl_syntax_basic_logic IMPLEMENTATION.
 
   METHOD setup.
-    mo = zcl_abapgit_syntax_highlighter=>create( '*.abap' ).
+    mo_syntax_highlighter = zcl_abapgit_syntax_highlighter=>create( '*.abap' ).
   ENDMETHOD.
 
   METHOD format_line.
@@ -564,7 +564,7 @@ CLASS ltcl_syntax_basic_logic IMPLEMENTATION.
       ' <span class="text">&#39;FM_NAME&#39;</span>.' &&    "#EC NOTEXT
       ' <span class="comment">&quot; Commented</span>'.     "#EC NOTEXT
 
-    lv_line_act = mo->process_line( lv_line ).
+    lv_line_act = mo_syntax_highlighter->process_line( lv_line ).
 
     cl_abap_unit_assert=>assert_equals( exp = lv_line_exp
                                         act = lv_line_act
@@ -577,7 +577,7 @@ CLASS ltcl_syntax_basic_logic IMPLEMENTATION.
     DATA lv_line_act TYPE string.
 
     " Call the method and compare results
-    lv_line_act = mo->apply_style( iv_line  = 'CALL FUNCTION' "#EC NOTEXT
+    lv_line_act = mo_syntax_highlighter->apply_style( iv_line  = 'CALL FUNCTION' "#EC NOTEXT
                                    iv_class = zcl_abapgit_syntax_abap=>c_css-keyword ).
 
     cl_abap_unit_assert=>assert_equals(
@@ -592,7 +592,7 @@ CLASS ltcl_syntax_basic_logic IMPLEMENTATION.
     DATA lv_line_act TYPE string.
 
     " Call the method with empty parameter and compare results
-    lv_line_act = mo->process_line( '' ).
+    lv_line_act = mo_syntax_highlighter->process_line( '' ).
 
     cl_abap_unit_assert=>assert_equals(
       act = lv_line_act
@@ -600,7 +600,7 @@ CLASS ltcl_syntax_basic_logic IMPLEMENTATION.
       msg = 'Failure in method process_line.' ).            "#EC NOTEXT
 
     " Call the method with non-empty line and compare results
-    lv_line_act = mo->process_line( '* CALL FUNCTION' ). "#EC NOTEXT
+    lv_line_act = mo_syntax_highlighter->process_line( '* CALL FUNCTION' ). "#EC NOTEXT
 
     cl_abap_unit_assert=>assert_equals(
       act = lv_line_act
diff --git a/src/ui/db/zcl_abapgit_gui_page_db_edit.clas.abap b/src/ui/db/zcl_abapgit_gui_page_db_edit.clas.abap
index af21527c7..b5775fbfa 100644
--- a/src/ui/db/zcl_abapgit_gui_page_db_edit.clas.abap
+++ b/src/ui/db/zcl_abapgit_gui_page_db_edit.clas.abap
@@ -25,9 +25,9 @@ CLASS zcl_abapgit_gui_page_db_edit DEFINITION
   PRIVATE SECTION.
 
     CONSTANTS:
-      BEGIN OF gc_action,
+      BEGIN OF c_action,
         update TYPE string VALUE 'update',
-      END OF gc_action .
+      END OF c_action .
     DATA ms_key TYPE zif_abapgit_persistence=>ty_content .
 
     CLASS-METHODS update
@@ -65,10 +65,10 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DB_EDIT IMPLEMENTATION.
 
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'XMLDATA'
-        it = lt_fields
+        iv_name = 'XMLDATA'
+        it_field = lt_fields
       CHANGING
-        cv = rs_content-data_str ).
+        cg_field = rs_content-data_str ).
 
     IF rs_content-data_str(1) <> '<' AND rs_content-data_str+1(1) = '<'. " Hmmm ???
       rs_content-data_str = rs_content-data_str+1.
@@ -113,7 +113,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DB_EDIT IMPLEMENTATION.
     ro_html->add( '</td></tr></table>' ).
 
     " Form
-    ro_html->add( |<form id="db_form" method="post" action="sapevent:| && |{ gc_action-update }">| ).
+    ro_html->add( |<form id="db_form" method="post" action="sapevent:| && |{ c_action-update }">| ).
     ro_html->add( |<input type="hidden" name="type" value="{ ms_key-type }">| ).
     ro_html->add( |<input type="hidden" name="value" value="{ ms_key-value }">| ).
     ro_html->add( |<textarea rows="20" cols="100" name="xmldata">{ lv_data }</textarea>| ).
@@ -143,7 +143,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DB_EDIT IMPLEMENTATION.
     DATA: ls_db TYPE zif_abapgit_persistence=>ty_content.
 
     CASE iv_action.
-      WHEN gc_action-update.
+      WHEN c_action-update.
         ls_db = dbcontent_decode( it_postdata ).
         update( ls_db ).
         ev_state = zif_abapgit_definitions=>gc_event_state-go_back.
diff --git a/src/ui/zcl_abapgit_gui_page_bkg.clas.abap b/src/ui/zcl_abapgit_gui_page_bkg.clas.abap
index 7648c1d2b..e55d3c1b2 100644
--- a/src/ui/zcl_abapgit_gui_page_bkg.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_bkg.clas.abap
@@ -96,27 +96,27 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_BKG IMPLEMENTATION.
 
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'METHOD'
-        it   = lt_fields
+        iv_name = 'METHOD'
+        it_field   = lt_fields
       CHANGING
-        cv   = rs_fields ).
+        cg_field   = rs_fields ).
     IF rs_fields-method IS INITIAL.
       RETURN.
     ENDIF.
 
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'USERNAME'
-        it   = lt_fields
+        iv_name = 'USERNAME'
+        it_field   = lt_fields
       CHANGING
-        cv   = rs_fields ).
+        cg_field   = rs_fields ).
 
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'PASSWORD'
-        it   = lt_fields
+        iv_name = 'PASSWORD'
+        it_field   = lt_fields
       CHANGING
-        cv   = rs_fields ).
+        cg_field   = rs_fields ).
 
 
     CALL METHOD (rs_fields-method)=>zif_abapgit_background~get_settings
@@ -125,10 +125,10 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_BKG IMPLEMENTATION.
     LOOP AT rs_fields-settings ASSIGNING <ls_setting>.
       zcl_abapgit_html_action_utils=>get_field(
         EXPORTING
-          name = <ls_setting>-key
-          it   = lt_fields
+          iv_name = <ls_setting>-key
+          it_field   = lt_fields
         CHANGING
-          cv   = <ls_setting>-value ).
+          cg_field   = <ls_setting>-value ).
     ENDLOOP.
 
     ASSERT NOT rs_fields IS INITIAL.
diff --git a/src/ui/zcl_abapgit_gui_page_commit.clas.abap b/src/ui/zcl_abapgit_gui_page_commit.clas.abap
index 0a0cba84a..acce5ad08 100644
--- a/src/ui/zcl_abapgit_gui_page_commit.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_commit.clas.abap
@@ -27,7 +27,7 @@ CLASS zcl_abapgit_gui_page_commit DEFINITION
       IMPORTING
         !it_postdata TYPE cnht_post_data_tab
       EXPORTING
-        !es_fields   TYPE any .
+        !eg_fields   TYPE any .
 
     METHODS render_content
         REDEFINITION .
@@ -79,7 +79,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION.
 
     FIELD-SYMBOLS <lv_body> TYPE string.
 
-    CLEAR es_fields.
+    CLEAR eg_fields.
 
     CONCATENATE LINES OF it_postdata INTO lv_string.
     REPLACE ALL OCCURRENCES OF zif_abapgit_definitions=>gc_crlf    IN lv_string WITH lc_replace.
@@ -88,42 +88,42 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION.
 
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'COMMITTER_NAME'
-        it = lt_fields
+        iv_name = 'COMMITTER_NAME'
+        it_field = lt_fields
       CHANGING
-        cv = es_fields ).
+        cg_field = eg_fields ).
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'COMMITTER_EMAIL'
-        it = lt_fields
+        iv_name = 'COMMITTER_EMAIL'
+        it_field = lt_fields
       CHANGING
-        cv = es_fields ).
+        cg_field = eg_fields ).
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'AUTHOR_NAME'
-        it = lt_fields
+        iv_name = 'AUTHOR_NAME'
+        it_field = lt_fields
       CHANGING
-        cv = es_fields ).
+        cg_field = eg_fields ).
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'AUTHOR_EMAIL'
-        it = lt_fields
+        iv_name = 'AUTHOR_EMAIL'
+        it_field = lt_fields
       CHANGING
-      cv = es_fields ).
+      cg_field = eg_fields ).
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'COMMENT'
-        it = lt_fields
+        iv_name = 'COMMENT'
+        it_field = lt_fields
       CHANGING
-      cv = es_fields ).
+      cg_field = eg_fields ).
     zcl_abapgit_html_action_utils=>get_field(
       EXPORTING
-        name = 'BODY'
-        it = lt_fields
+        iv_name = 'BODY'
+        it_field = lt_fields
       CHANGING
-        cv = es_fields ).
+        cg_field = eg_fields ).
 
-    ASSIGN COMPONENT 'BODY' OF STRUCTURE es_fields TO <lv_body>.
+    ASSIGN COMPONENT 'BODY' OF STRUCTURE eg_fields TO <lv_body>.
     ASSERT <lv_body> IS ASSIGNED.
     REPLACE ALL OCCURRENCES OF lc_replace IN <lv_body> WITH zif_abapgit_definitions=>gc_newline.
 
@@ -335,7 +335,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION.
 
         parse_commit_request(
           EXPORTING it_postdata = it_postdata
-          IMPORTING es_fields   = ls_commit ).
+          IMPORTING eg_fields   = ls_commit ).
 
         ls_commit-repo_key = mo_repo->get_key( ).
 
diff --git a/src/ui/zcl_abapgit_gui_page_merge_res.clas.abap b/src/ui/zcl_abapgit_gui_page_merge_res.clas.abap
index c8b174d6a..043bc95b4 100644
--- a/src/ui/zcl_abapgit_gui_page_merge_res.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_merge_res.clas.abap
@@ -117,31 +117,31 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_MERGE_RES IMPLEMENTATION.
 
     CONSTANTS: lc_replace TYPE string VALUE '<<new>>'.
 
-    DATA: BEGIN OF filedata,
+    DATA: BEGIN OF ls_filedata,
             merge_content TYPE string,
-          END OF filedata.
+          END OF ls_filedata.
 
     DATA: lv_string           TYPE string,
           lt_fields           TYPE tihttpnvp,
           lv_new_file_content TYPE xstring.
 
-    FIELD-SYMBOLS: <postdata_line> LIKE LINE OF it_postdata,
+    FIELD-SYMBOLS: <lv_postdata_line> LIKE LINE OF it_postdata,
                    <ls_conflict>   TYPE zif_abapgit_definitions=>ty_merge_conflict.
 
-    LOOP AT it_postdata ASSIGNING <postdata_line>.
-      lv_string = |{ lv_string }{ <postdata_line> }|.
+    LOOP AT it_postdata ASSIGNING <lv_postdata_line>.
+      lv_string = |{ lv_string }{ <lv_postdata_line> }|.
     ENDLOOP.
     REPLACE ALL OCCURRENCES OF zif_abapgit_definitions=>gc_crlf    IN lv_string WITH lc_replace.
     REPLACE ALL OCCURRENCES OF zif_abapgit_definitions=>gc_newline IN lv_string WITH lc_replace.
 
     lt_fields = zcl_abapgit_html_action_utils=>parse_fields_upper_case_name( lv_string ).
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'MERGE_CONTENT'
-                                                        it = lt_fields
-                                              CHANGING cv = filedata ).
-    filedata-merge_content = cl_http_utility=>unescape_url( escaped = filedata-merge_content ).
-    REPLACE ALL OCCURRENCES OF lc_replace IN filedata-merge_content WITH zif_abapgit_definitions=>gc_newline.
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'MERGE_CONTENT'
+                                                        it_field = lt_fields
+                                              CHANGING cg_field = ls_filedata ).
+    ls_filedata-merge_content = cl_http_utility=>unescape_url( escaped = ls_filedata-merge_content ).
+    REPLACE ALL OCCURRENCES OF lc_replace IN ls_filedata-merge_content WITH zif_abapgit_definitions=>gc_newline.
 
-    lv_new_file_content = zcl_abapgit_convert=>string_to_xstring_utf8( iv_string = filedata-merge_content ).
+    lv_new_file_content = zcl_abapgit_convert=>string_to_xstring_utf8( iv_string = ls_filedata-merge_content ).
 
     READ TABLE mt_conflicts ASSIGNING <ls_conflict> INDEX mv_current_conflict_index.
     <ls_conflict>-result_sha1 = zcl_abapgit_hash=>sha1( iv_type = zif_abapgit_definitions=>gc_type-blob
diff --git a/src/ui/zcl_abapgit_gui_page_tag.clas.abap b/src/ui/zcl_abapgit_gui_page_tag.clas.abap
index e5f39ada8..b161f462a 100644
--- a/src/ui/zcl_abapgit_gui_page_tag.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_tag.clas.abap
@@ -22,10 +22,10 @@ CLASS zcl_abapgit_gui_page_tag DEFINITION PUBLIC FINAL
       scripts        REDEFINITION.
 
   PRIVATE SECTION.
-    CONSTANTS: BEGIN OF co_tag_type,
+    CONSTANTS: BEGIN OF c_tag_type,
                  lightweight TYPE string VALUE 'lightweight',
                  annotated   TYPE string VALUE 'annotated',
-               END OF co_tag_type.
+               END OF c_tag_type.
 
     DATA: mo_repo_online   TYPE REF TO zcl_abapgit_repo_online,
           mv_selected_type TYPE string.
@@ -51,7 +51,7 @@ CLASS zcl_abapgit_gui_page_tag DEFINITION PUBLIC FINAL
 
       parse_tag_request
         IMPORTING it_postdata TYPE cnht_post_data_tab
-        EXPORTING es_fields   TYPE any,
+        EXPORTING eg_fields   TYPE any,
       parse_change_tag_type_request
         IMPORTING
           it_postdata TYPE cnht_post_data_tab.
@@ -60,7 +60,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
+CLASS zcl_abapgit_gui_page_tag IMPLEMENTATION.
 
 
   METHOD constructor.
@@ -69,7 +69,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
     mo_repo_online ?= io_repo.
 
     ms_control-page_title = 'TAG'.
-    mv_selected_type = co_tag_type-lightweight.
+    mv_selected_type = c_tag_type-lightweight.
 
   ENDMETHOD.
 
@@ -83,7 +83,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
 
     parse_tag_request(
       EXPORTING it_postdata = it_postdata
-      IMPORTING es_fields   = ls_tag ).
+      IMPORTING eg_fields   = ls_tag ).
 
     IF ls_tag-name IS INITIAL.
       zcx_abapgit_exception=>raise( |Please supply a tag name| ).
@@ -93,11 +93,11 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
     ASSERT ls_tag-name CP 'refs/tags/+*'.
 
     CASE mv_selected_type.
-      WHEN co_tag_type-lightweight.
+      WHEN c_tag_type-lightweight.
 
         ls_tag-type = zif_abapgit_definitions=>c_git_branch_type-lightweight_tag.
 
-      WHEN co_tag_type-annotated.
+      WHEN c_tag_type-annotated.
 
         ls_tag-type = zif_abapgit_definitions=>c_git_branch_type-annotated_tag.
 
@@ -128,13 +128,13 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
 
   METHOD parse_change_tag_type_request.
 
-    FIELD-SYMBOLS: <ls_postdata> TYPE cnht_post_data_line.
+    FIELD-SYMBOLS: <lv_postdata> TYPE cnht_post_data_line.
 
-    READ TABLE it_postdata ASSIGNING <ls_postdata>
+    READ TABLE it_postdata ASSIGNING <lv_postdata>
                            INDEX 1.
     IF sy-subrc = 0.
       FIND FIRST OCCURRENCE OF REGEX `type=(.*)`
-           IN <ls_postdata>
+           IN <lv_postdata>
            SUBMATCHES mv_selected_type.
     ENDIF.
 
@@ -152,21 +152,33 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
 
     FIELD-SYMBOLS <lv_body> TYPE string.
 
-    CLEAR es_fields.
+    CLEAR eg_fields.
 
     CONCATENATE LINES OF it_postdata INTO lv_string.
     REPLACE ALL OCCURRENCES OF zif_abapgit_definitions=>gc_crlf    IN lv_string WITH lc_replace.
     REPLACE ALL OCCURRENCES OF zif_abapgit_definitions=>gc_newline IN lv_string WITH lc_replace.
     lt_fields = zcl_abapgit_html_action_utils=>parse_fields_upper_case_name( lv_string ).
 
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'SHA1'         it = lt_fields CHANGING cv = es_fields ).
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'NAME'         it = lt_fields CHANGING cv = es_fields ).
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'TAGGER_NAME'  it = lt_fields CHANGING cv = es_fields ).
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'TAGGER_EMAIL' it = lt_fields CHANGING cv = es_fields ).
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'MESSAGE'      it = lt_fields CHANGING cv = es_fields ).
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'BODY'         it = lt_fields CHANGING cv = es_fields ).
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'SHA1'
+                                                        it_field = lt_fields
+                                              CHANGING cg_field = eg_fields ).
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'NAME'
+                                                        it_field = lt_fields
+                                              CHANGING cg_field = eg_fields ).
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'TAGGER_NAME'
+                                                        it_field = lt_fields
+                                              CHANGING cg_field = eg_fields ).
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'TAGGER_EMAIL'
+                                                        it_field = lt_fields
+                                              CHANGING cg_field = eg_fields ).
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'MESSAGE'
+                                                        it_field = lt_fields
+                                              CHANGING cg_field = eg_fields ).
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'BODY'
+                                                        it_field = lt_fields
+                                              CHANGING cg_field = eg_fields ).
 
-    ASSIGN COMPONENT 'BODY' OF STRUCTURE es_fields TO <lv_body>.
+    ASSIGN COMPONENT 'BODY' OF STRUCTURE eg_fields TO <lv_body>.
     ASSERT <lv_body> IS ASSIGNED.
     REPLACE ALL OCCURRENCES OF lc_replace IN <lv_body> WITH zif_abapgit_definitions=>gc_newline.
 
@@ -197,7 +209,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
           lv_body_size TYPE i,
           lt_type      TYPE stringtab,
           lv_selected  TYPE string.
-    FIELD-SYMBOLS: <type> LIKE LINE OF lt_type.
+    FIELD-SYMBOLS: <lv_type> LIKE LINE OF lt_type.
 
     lo_user  = zcl_abapgit_persistence_user=>get_instance( ).
 
@@ -225,26 +237,26 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
     ro_html->add( '<form id="commit_form" class="aligned-form grey70"'
                && ' method="post" action="sapevent:commit_post">' ).
 
-    INSERT co_tag_type-lightweight
+    INSERT c_tag_type-lightweight
            INTO TABLE lt_type.
 
-    INSERT co_tag_type-annotated
+    INSERT c_tag_type-annotated
            INTO TABLE lt_type.
 
     ro_html->add( '<div class="row">' ).
     ro_html->add( 'Tag type <select name="folder_logic" onchange="onTagTypeChange(this)">' ).
 
-    LOOP AT lt_type ASSIGNING <type>.
+    LOOP AT lt_type ASSIGNING <lv_type>.
 
-      IF mv_selected_type = <type>.
+      IF mv_selected_type = <lv_type>.
         lv_selected = 'selected'.
       ELSE.
         CLEAR: lv_selected.
       ENDIF.
 
-      ro_html->add( |<option value="{ <type> }" |
+      ro_html->add( |<option value="{ <lv_type> }" |
                  && |{ lv_selected }>|
-                 && |{ <type> }</option>| ).
+                 && |{ <lv_type> }</option>| ).
 
     ENDLOOP.
 
@@ -261,7 +273,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TAG IMPLEMENTATION.
     ro_html->add( render_text_input( iv_name  = 'name'
                                      iv_label = 'tag name' ) ).
 
-    IF mv_selected_type = co_tag_type-annotated.
+    IF mv_selected_type = c_tag_type-annotated.
 
       ro_html->add( render_text_input( iv_name  = 'tagger_name'
                                        iv_label = 'tagger name'
diff --git a/src/ui/zcl_abapgit_html_action_utils.clas.abap b/src/ui/zcl_abapgit_html_action_utils.clas.abap
index 0418844bc..0ea5591b7 100644
--- a/src/ui/zcl_abapgit_html_action_utils.clas.abap
+++ b/src/ui/zcl_abapgit_html_action_utils.clas.abap
@@ -19,16 +19,16 @@ CLASS zcl_abapgit_html_action_utils DEFINITION
         VALUE(rt_fields) TYPE tihttpnvp .
     CLASS-METHODS add_field
       IMPORTING
-        !name TYPE string
-        !iv   TYPE any
+        !iv_name TYPE string
+        !ig_field   TYPE any
       CHANGING
-        !ct   TYPE tihttpnvp .
+        !ct_field   TYPE tihttpnvp .
     CLASS-METHODS get_field
       IMPORTING
-        !name TYPE string
-        !it   TYPE tihttpnvp
+        !iv_name  TYPE string
+        !it_field TYPE tihttpnvp
       CHANGING
-        !cv   TYPE any .
+        !cg_field TYPE any .
     CLASS-METHODS jump_encode
       IMPORTING
         !iv_obj_type     TYPE tadir-object
@@ -103,29 +103,29 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
+CLASS zcl_abapgit_html_action_utils IMPLEMENTATION.
 
 
   METHOD add_field.
 
-    DATA ls_field LIKE LINE OF ct.
+    DATA ls_field LIKE LINE OF ct_field.
 
     FIELD-SYMBOLS <lg_src> TYPE any.
 
-    ls_field-name = name.
+    ls_field-name = iv_name.
 
-    CASE cl_abap_typedescr=>describe_by_data( iv )->kind.
+    CASE cl_abap_typedescr=>describe_by_data( ig_field )->kind.
       WHEN cl_abap_typedescr=>kind_elem.
-        ls_field-value = iv.
+        ls_field-value = ig_field.
       WHEN cl_abap_typedescr=>kind_struct.
-        ASSIGN COMPONENT name OF STRUCTURE iv TO <lg_src>.
+        ASSIGN COMPONENT iv_name OF STRUCTURE ig_field TO <lg_src>.
         ASSERT <lg_src> IS ASSIGNED.
         ls_field-value = <lg_src>.
       WHEN OTHERS.
         ASSERT 0 = 1.
     ENDCASE.
 
-    APPEND ls_field TO ct.
+    APPEND ls_field TO ct_field.
 
   ENDMETHOD.  "add_field
 
@@ -136,8 +136,8 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
 
     lt_fields = parse_fields_upper_case_name( cl_http_utility=>unescape_url( |{ iv_string }| ) ).
 
-    get_field( EXPORTING name = 'TYPE'  it = lt_fields CHANGING cv = rs_key-type ).
-    get_field( EXPORTING name = 'VALUE' it = lt_fields CHANGING cv = rs_key-value ).
+    get_field( EXPORTING iv_name = 'TYPE'  it_field = lt_fields CHANGING cg_field = rs_key-type ).
+    get_field( EXPORTING iv_name = 'VALUE' it_field = lt_fields CHANGING cg_field = rs_key-value ).
 
   ENDMETHOD.                    "dbkey_decode
 
@@ -146,8 +146,8 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
 
     DATA: lt_fields TYPE tihttpnvp.
 
-    add_field( EXPORTING name = 'TYPE'  iv = is_key-type CHANGING ct = lt_fields ).
-    add_field( EXPORTING name = 'VALUE' iv = is_key-value CHANGING ct = lt_fields ).
+    add_field( EXPORTING iv_name = 'TYPE'  ig_field = is_key-type CHANGING ct_field = lt_fields ).
+    add_field( EXPORTING iv_name = 'VALUE' ig_field = is_key-value CHANGING ct_field = lt_fields ).
 
     rv_string = cl_http_utility=>if_http_utility~fields_to_string( lt_fields ).
 
@@ -159,7 +159,7 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
     DATA: lt_fields TYPE tihttpnvp.
 
     lt_fields = parse_fields( iv_string ).
-    get_field( EXPORTING name = 'PATH' it = lt_fields CHANGING cv = rv_path ).
+    get_field( EXPORTING iv_name = 'PATH' it_field = lt_fields CHANGING cg_field = rv_path ).
 
   ENDMETHOD.                    "dir_decode
 
@@ -167,7 +167,7 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
   METHOD dir_encode.
 
     DATA: lt_fields TYPE tihttpnvp.
-    add_field( EXPORTING name = 'PATH' iv = iv_path CHANGING ct = lt_fields ).
+    add_field( EXPORTING iv_name = 'PATH' ig_field = iv_path CHANGING ct_field = lt_fields ).
     rv_string = cl_http_utility=>if_http_utility~fields_to_string( lt_fields ).
 
   ENDMETHOD.                    "dir_encode
@@ -189,9 +189,9 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
     DATA: lt_fields TYPE tihttpnvp.
 
 
-    add_field( EXPORTING name = 'KEY'      iv = iv_key CHANGING ct = lt_fields ).
-    add_field( EXPORTING name = 'PATH'     iv = ig_file CHANGING ct = lt_fields ).
-    add_field( EXPORTING name = 'FILENAME' iv = ig_file CHANGING ct = lt_fields ).
+    add_field( EXPORTING iv_name = 'KEY'      ig_field = iv_key CHANGING ct_field = lt_fields ).
+    add_field( EXPORTING iv_name = 'PATH'     ig_field = ig_file CHANGING ct_field = lt_fields ).
+    add_field( EXPORTING iv_name = 'FILENAME' ig_field = ig_file CHANGING ct_field = lt_fields ).
 
     rv_string = cl_http_utility=>if_http_utility~fields_to_string( lt_fields ).
 
@@ -207,16 +207,16 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
     CLEAR: ev_key, eg_file, eg_object.
     lt_fields = parse_fields_upper_case_name( iv_string ).
 
-    get_field( EXPORTING name = 'KEY'      it = lt_fields CHANGING cv = ev_key ).
+    get_field( EXPORTING iv_name = 'KEY'      it_field = lt_fields CHANGING cg_field = ev_key ).
 
     IF eg_file IS SUPPLIED.
-      get_field( EXPORTING name = 'PATH'     it = lt_fields CHANGING cv = eg_file ).
-      get_field( EXPORTING name = 'FILENAME' it = lt_fields CHANGING cv = eg_file ).
+      get_field( EXPORTING iv_name = 'PATH'     it_field = lt_fields CHANGING cg_field = eg_file ).
+      get_field( EXPORTING iv_name = 'FILENAME' it_field = lt_fields CHANGING cg_field = eg_file ).
     ENDIF.
 
     IF eg_object IS SUPPLIED.
-      get_field( EXPORTING name = 'OBJ_TYPE' it = lt_fields CHANGING cv = eg_object ).
-      get_field( EXPORTING name = 'OBJ_NAME' it = lt_fields CHANGING cv = eg_object ).
+      get_field( EXPORTING iv_name = 'OBJ_TYPE' it_field = lt_fields CHANGING cg_field = eg_object ).
+      get_field( EXPORTING iv_name = 'OBJ_NAME' it_field = lt_fields CHANGING cg_field = eg_object ).
     ENDIF.
 
   ENDMETHOD.                    "file_decode
@@ -224,20 +224,20 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
 
   METHOD get_field.
 
-    FIELD-SYMBOLS: <ls_field> LIKE LINE OF it,
+    FIELD-SYMBOLS: <ls_field> LIKE LINE OF it_field,
                    <lg_dest>  TYPE any.
 
 
-    READ TABLE it ASSIGNING <ls_field> WITH KEY name = name.
+    READ TABLE it_field ASSIGNING <ls_field> WITH KEY name = iv_name.
     IF sy-subrc IS NOT INITIAL.
       RETURN.
     ENDIF.
 
-    CASE cl_abap_typedescr=>describe_by_data( cv )->kind.
+    CASE cl_abap_typedescr=>describe_by_data( cg_field )->kind.
       WHEN cl_abap_typedescr=>kind_elem.
-        cv = <ls_field>-value.
+        cg_field = <ls_field>-value.
       WHEN cl_abap_typedescr=>kind_struct.
-        ASSIGN COMPONENT name OF STRUCTURE cv TO <lg_dest>.
+        ASSIGN COMPONENT iv_name OF STRUCTURE cg_field TO <lg_dest>.
         ASSERT <lg_dest> IS ASSIGNED.
         <lg_dest> = <ls_field>-value.
       WHEN OTHERS.
@@ -253,8 +253,8 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
 
     lt_fields = parse_fields( iv_string ).
 
-    get_field( EXPORTING name = 'TYPE' it = lt_fields CHANGING cv = ev_obj_type ).
-    get_field( EXPORTING name = 'NAME' it = lt_fields CHANGING cv = ev_obj_name ).
+    get_field( EXPORTING iv_name = 'TYPE' it_field = lt_fields CHANGING cg_field = ev_obj_type ).
+    get_field( EXPORTING iv_name = 'NAME' it_field = lt_fields CHANGING cg_field = ev_obj_name ).
 
   ENDMETHOD.                    "jump_decode
 
@@ -264,8 +264,8 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
     DATA: lt_fields TYPE tihttpnvp.
 
 
-    add_field( EXPORTING name = 'TYPE' iv = iv_obj_type CHANGING ct = lt_fields ).
-    add_field( EXPORTING name = 'NAME' iv = iv_obj_name CHANGING ct = lt_fields ).
+    add_field( EXPORTING iv_name = 'TYPE' ig_field = iv_obj_type CHANGING ct_field = lt_fields ).
+    add_field( EXPORTING iv_name = 'NAME' ig_field = iv_obj_name CHANGING ct_field = lt_fields ).
 
     rv_string = cl_http_utility=>if_http_utility~fields_to_string( lt_fields ).
 
@@ -277,9 +277,9 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
     DATA: lt_fields TYPE tihttpnvp.
 
 
-    add_field( EXPORTING name = 'KEY'      iv = iv_key CHANGING ct = lt_fields ).
-    add_field( EXPORTING name = 'OBJ_TYPE' iv = ig_object CHANGING ct = lt_fields ).
-    add_field( EXPORTING name = 'OBJ_NAME' iv = ig_object CHANGING ct = lt_fields ).
+    add_field( EXPORTING iv_name = 'KEY'      ig_field = iv_key CHANGING ct_field = lt_fields ).
+    add_field( EXPORTING iv_name = 'OBJ_TYPE' ig_field = ig_object CHANGING ct_field = lt_fields ).
+    add_field( EXPORTING iv_name = 'OBJ_NAME' ig_field = ig_object CHANGING ct_field = lt_fields ).
 
     rv_string = cl_http_utility=>if_http_utility~fields_to_string( lt_fields ).
 
@@ -329,8 +329,8 @@ CLASS ZCL_ABAPGIT_HTML_ACTION_UTILS IMPLEMENTATION.
 
     lt_fields = parse_fields_upper_case_name( iv_getdata ).
 
-    get_field( EXPORTING name = 'KEY'  it = lt_fields CHANGING cv = ev_key ).
-    get_field( EXPORTING name = 'SEED' it = lt_fields CHANGING cv = ev_seed ).
+    get_field( EXPORTING iv_name = 'KEY'  it_field = lt_fields CHANGING cg_field = ev_key ).
+    get_field( EXPORTING iv_name = 'SEED' it_field = lt_fields CHANGING cg_field = ev_seed ).
 
     ASSERT NOT ev_key IS INITIAL.
 
diff --git a/src/ui/zcl_abapgit_html_action_utils.clas.testclasses.abap b/src/ui/zcl_abapgit_html_action_utils.clas.testclasses.abap
index 67b8a0317..7cd0d3ec4 100644
--- a/src/ui/zcl_abapgit_html_action_utils.clas.testclasses.abap
+++ b/src/ui/zcl_abapgit_html_action_utils.clas.testclasses.abap
@@ -25,24 +25,24 @@ CLASS ltcl_html_action_utils DEFINITION FOR TESTING RISK LEVEL HARMLESS
                   lower_case_ue TYPE string,
                 END OF gs_german_umlaut_as_char.
 
-    DATA m_given_parse_string TYPE string.
+    DATA mv_given_parse_string TYPE string.
     DATA mt_parsed_fields TYPE tihttpnvp.
 
     METHODS _given_string_is
       IMPORTING
-        i_string TYPE string.
+        iv_string TYPE string.
     METHODS _when_fields_are_parsed.
     METHODS _then_fields_should_be
       IMPORTING
-        index TYPE i
-        name  TYPE string
-        value TYPE string.
+        iv_index TYPE i
+        iv_name  TYPE string
+        iv_value TYPE string.
 
     CLASS-METHODS _hex_to_char
       IMPORTING
-        i_x        TYPE xstring
+        iv_x        TYPE xstring
       RETURNING
-        VALUE(r_s) TYPE string.
+        VALUE(rv_s) TYPE string.
 
 ENDCLASS. "ltcl_html_action_utils
 
@@ -70,10 +70,10 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
     ls_field-value = 'TEST'.
     APPEND ls_field TO lt_answer.
 
-    zcl_abapgit_html_action_utils=>add_field( EXPORTING name = 'NAME' iv = 'TEST'
-                                      CHANGING  ct = lt_fields ).
-    zcl_abapgit_html_action_utils=>add_field( EXPORTING name = 'VALUE' iv = ls_field
-                                      CHANGING  ct = lt_fields ).
+    zcl_abapgit_html_action_utils=>add_field( EXPORTING iv_name = 'NAME' ig_field = 'TEST'
+                                      CHANGING  ct_field = lt_fields ).
+    zcl_abapgit_html_action_utils=>add_field( EXPORTING iv_name = 'VALUE' ig_field = ls_field
+                                      CHANGING  ct_field = lt_fields ).
 
     cl_abap_unit_assert=>assert_equals(
       act = lt_fields
@@ -91,10 +91,10 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
     ls_answer-value = 'TEST'.
     APPEND ls_answer TO lt_fields.
 
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'NAME' it = lt_fields
-                                      CHANGING  cv   = ls_field-value ).
-    zcl_abapgit_html_action_utils=>get_field( EXPORTING name = 'NAME' it = lt_fields
-                                      CHANGING  cv   = ls_field ).
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'NAME' it_field = lt_fields
+                                      CHANGING  cg_field   = ls_field-value ).
+    zcl_abapgit_html_action_utils=>get_field( EXPORTING iv_name = 'NAME' it_field = lt_fields
+                                      CHANGING  cg_field   = ls_field ).
 
     ls_answer-name  = 'TEST'.
     ls_answer-value = 'TEST'.
@@ -111,7 +111,7 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
 
     _when_fields_are_parsed( ).
 
-    _then_fields_should_be( index = 1 name = `COMMITTER_NAME` value = `Gustav Gans` ).
+    _then_fields_should_be( iv_index = 1 iv_name = `COMMITTER_NAME` iv_value = `Gustav Gans` ).
 
   ENDMETHOD.
 
@@ -126,29 +126,29 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
 
     _when_fields_are_parsed( ).
 
-    _then_fields_should_be( index = 1
-                            name  = `COMMITTER_NAME`
-                            value = `Albert Schweitzer` ).
+    _then_fields_should_be( iv_index = 1
+                            iv_name  = `COMMITTER_NAME`
+                            iv_value = `Albert Schweitzer` ).
 
-    _then_fields_should_be( index = 2
-                            name  = `COMMITTER_EMAIL`
-                            value = `albert.schweitzer@googlemail.com` ).
+    _then_fields_should_be( iv_index = 2
+                            iv_name  = `COMMITTER_EMAIL`
+                            iv_value = `albert.schweitzer@googlemail.com` ).
 
-    _then_fields_should_be( index = 3
-                            name  = `COMMENT`
-                            value = `dummy comment` ).
+    _then_fields_should_be( iv_index = 3
+                            iv_name  = `COMMENT`
+                            iv_value = `dummy comment` ).
 
-    _then_fields_should_be( index = 4
-                            name  = `BODY`
-                            value = `Message body<<new>><<new>>with line break<<new>>` ).
+    _then_fields_should_be( iv_index = 4
+                            iv_name  = `BODY`
+                            iv_value = `Message body<<new>><<new>>with line break<<new>>` ).
 
-    _then_fields_should_be( index = 5
-                            name  = `AUTHOR_NAME`
-                            value = `Karl Klammer` ).
+    _then_fields_should_be( iv_index = 5
+                            iv_name  = `AUTHOR_NAME`
+                            iv_value = `Karl Klammer` ).
 
-    _then_fields_should_be( index = 6
-                            name  = `AUTHOR_EMAIL`
-                            value = `karl@klammer.com` ).
+    _then_fields_should_be( iv_index = 6
+                            iv_name  = `AUTHOR_EMAIL`
+                            iv_value = `karl@klammer.com` ).
 
   ENDMETHOD.
 
@@ -159,9 +159,9 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
 
     _when_fields_are_parsed( ).
 
-    _then_fields_should_be( index = 1
-                            name  = '/SRC/ZFOOBAR.PROG.ABAP'
-                            value = '?' ).
+    _then_fields_should_be( iv_index = 1
+                            iv_name  = '/SRC/ZFOOBAR.PROG.ABAP'
+                            iv_value = '?' ).
 
   ENDMETHOD.
 
@@ -188,41 +188,41 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
 
     _when_fields_are_parsed( ).
 
-    _then_fields_should_be( index = 1
-                            name  = `COMMITTER_NAME`
-                            value = |Christian G{ lv_ue }nter| ).
+    _then_fields_should_be( iv_index = 1
+                            iv_name  = `COMMITTER_NAME`
+                            iv_value = |Christian G{ lv_ue }nter| ).
 
-    _then_fields_should_be( index = 2
-                            name  = `COMMITTER_EMAIL`
-                            value = `guenne@googlemail.com` ).
+    _then_fields_should_be( iv_index = 2
+                            iv_name  = `COMMITTER_EMAIL`
+                            iv_value = `guenne@googlemail.com` ).
 
-    _then_fields_should_be( index = 3
-                            name  = `COMMENT`
-                            value = lv_ae_oe_ue ).
+    _then_fields_should_be( iv_index = 3
+                            iv_name  = `COMMENT`
+                            iv_value = lv_ae_oe_ue ).
 
-    _then_fields_should_be( index = 4
-                            name  = `BODY`
-                            value = |Message body<<new>><<new>>with line break<<new>>and umlauts. { lv_ae_oe_ue }| ).
+    _then_fields_should_be( iv_index = 4
+                            iv_name  = `BODY`
+                            iv_value = |Message body<<new>><<new>>with line break<<new>>and umlauts. { lv_ae_oe_ue }| ).
 
-    _then_fields_should_be( index = 5
-                            name  = `AUTHOR_NAME`
-                            value = |Gerd Schr{ lv_oe }der| ).
+    _then_fields_should_be( iv_index = 5
+                            iv_name  = `AUTHOR_NAME`
+                            iv_value = |Gerd Schr{ lv_oe }der| ).
 
-    _then_fields_should_be( index = 6
-                            name  = `AUTHOR_EMAIL`
-                            value = `gerd@schroeder.com` ).
+    _then_fields_should_be( iv_index = 6
+                            iv_name  = `AUTHOR_EMAIL`
+                            iv_value = `gerd@schroeder.com` ).
 
   ENDMETHOD.
 
   METHOD _given_string_is.
 
-    m_given_parse_string = i_string.
+    mv_given_parse_string = iv_string.
 
   ENDMETHOD.
 
   METHOD _when_fields_are_parsed.
 
-    mt_parsed_fields = zcl_abapgit_html_action_utils=>parse_fields_upper_case_name( m_given_parse_string ).
+    mt_parsed_fields = zcl_abapgit_html_action_utils=>parse_fields_upper_case_name( mv_given_parse_string ).
 
   ENDMETHOD.
 
@@ -231,18 +231,18 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
     FIELD-SYMBOLS: <ls_parsed_field> LIKE LINE OF mt_parsed_fields.
 
     READ TABLE mt_parsed_fields ASSIGNING <ls_parsed_field>
-                                INDEX index.
+                                INDEX iv_index.
 
     cl_abap_unit_assert=>assert_subrc( exp = 0
-                                       msg = |No parsed field found at index { index }| ).
+                                       msg = |No parsed field found at index { iv_index }| ).
 
     cl_abap_unit_assert=>assert_equals( act = <ls_parsed_field>-name
-                                        exp = name
-                                        msg = |Name at index { index } should be { name }| ).
+                                        exp = iv_name
+                                        msg = |Name at index { iv_index } should be { iv_name }| ).
 
     cl_abap_unit_assert=>assert_equals( act = <ls_parsed_field>-value
-                                        exp = value
-                                        msg = |Value at index { index } should be { value }| ).
+                                        exp = iv_value
+                                        msg = |Value at index { iv_index } should be { iv_value }| ).
 
   ENDMETHOD.
 
@@ -251,7 +251,7 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
     DATA lo_conv TYPE REF TO cl_abap_conv_in_ce.
 
     lo_conv = cl_abap_conv_in_ce=>create( ).
-    lo_conv->convert( EXPORTING input = i_x IMPORTING data = r_s ).
+    lo_conv->convert( EXPORTING input = iv_x IMPORTING data = rv_s ).
 
   ENDMETHOD.