diff --git a/src/zcl_abapgit_factory.clas.abap b/src/zcl_abapgit_factory.clas.abap
index 5bf49aad8..a0331b8d4 100644
--- a/src/zcl_abapgit_factory.clas.abap
+++ b/src/zcl_abapgit_factory.clas.abap
@@ -30,7 +30,7 @@ CLASS zcl_abapgit_factory DEFINITION
           iv_package             TYPE devclass
         RETURNING
           VALUE(ri_syntax_check) TYPE REF TO zif_abapgit_code_inspector
-        raising
+        RAISING
           zcx_abapgit_exception.
 
 
@@ -58,10 +58,10 @@ CLASS zcl_abapgit_factory DEFINITION
                        WITH UNIQUE KEY package.
 
     CLASS-DATA:
-      mi_tadir          TYPE REF TO zif_abapgit_tadir,
-      mt_sap_package    TYPE tty_sap_package,
-      mt_code_inspector TYPE tty_code_inspector,
-      mt_syntax_check   TYPE tty_syntax_check.
+      gi_tadir          TYPE REF TO zif_abapgit_tadir,
+      gt_sap_package    TYPE tty_sap_package,
+      gt_code_inspector TYPE tty_code_inspector,
+      gt_syntax_check   TYPE tty_syntax_check.
 
 ENDCLASS.
 
@@ -71,11 +71,11 @@ CLASS zcl_abapgit_factory IMPLEMENTATION.
 
   METHOD get_tadir.
 
-    IF mi_tadir IS INITIAL.
-      CREATE OBJECT mi_tadir TYPE zcl_abapgit_tadir.
+    IF gi_tadir IS INITIAL.
+      CREATE OBJECT gi_tadir TYPE zcl_abapgit_tadir.
     ENDIF.
 
-    ri_tadir = mi_tadir.
+    ri_tadir = gi_tadir.
 
   ENDMETHOD.
 
@@ -84,7 +84,7 @@ CLASS zcl_abapgit_factory IMPLEMENTATION.
     DATA: ls_sap_package TYPE ty_sap_package.
     FIELD-SYMBOLS: <ls_sap_package> TYPE ty_sap_package.
 
-    READ TABLE mt_sap_package ASSIGNING <ls_sap_package>
+    READ TABLE gt_sap_package ASSIGNING <ls_sap_package>
                               WITH TABLE KEY package = iv_package.
     IF sy-subrc <> 0.
 
@@ -94,7 +94,7 @@ CLASS zcl_abapgit_factory IMPLEMENTATION.
           iv_package = iv_package.
 
       INSERT ls_sap_package
-             INTO TABLE mt_sap_package
+             INTO TABLE gt_sap_package
              ASSIGNING <ls_sap_package>.
 
     ENDIF.
@@ -105,10 +105,10 @@ CLASS zcl_abapgit_factory IMPLEMENTATION.
 
   METHOD get_code_inspector.
 
-    DATA: ls_code_inspector LIKE LINE OF mt_code_inspector.
+    DATA: ls_code_inspector LIKE LINE OF gt_code_inspector.
     FIELD-SYMBOLS: <ls_code_inspector> TYPE zcl_abapgit_factory=>ty_code_inspector.
 
-    READ TABLE mt_code_inspector ASSIGNING <ls_code_inspector>
+    READ TABLE gt_code_inspector ASSIGNING <ls_code_inspector>
                                  WITH TABLE KEY package            = iv_package
                                                 check_variant_name = iv_check_variant_name.
     IF sy-subrc <> 0.
@@ -121,7 +121,7 @@ CLASS zcl_abapgit_factory IMPLEMENTATION.
           iv_check_variant_name = iv_check_variant_name.
 
       INSERT ls_code_inspector
-             INTO TABLE mt_code_inspector
+             INTO TABLE gt_code_inspector
              ASSIGNING <ls_code_inspector>.
 
     ENDIF.
@@ -132,10 +132,10 @@ CLASS zcl_abapgit_factory IMPLEMENTATION.
 
   METHOD get_syntax_check.
 
-    DATA: ls_syntax_check LIKE LINE OF mt_syntax_check.
+    DATA: ls_syntax_check LIKE LINE OF gt_syntax_check.
     FIELD-SYMBOLS: <ls_syntax_check> TYPE zcl_abapgit_factory=>ty_syntax_check.
 
-    READ TABLE mt_syntax_check ASSIGNING <ls_syntax_check>
+    READ TABLE gt_syntax_check ASSIGNING <ls_syntax_check>
                                WITH TABLE KEY package = iv_package.
     IF sy-subrc <> 0.
       ls_syntax_check-package =  iv_package.
@@ -145,7 +145,7 @@ CLASS zcl_abapgit_factory IMPLEMENTATION.
           iv_package = iv_package.
 
       INSERT ls_syntax_check
-             INTO TABLE mt_syntax_check
+             INTO TABLE gt_syntax_check
              ASSIGNING <ls_syntax_check>.
 
     ENDIF.
diff --git a/src/zcl_abapgit_injector.clas.abap b/src/zcl_abapgit_injector.clas.abap
index 2fdfba815..85e5216b3 100644
--- a/src/zcl_abapgit_injector.clas.abap
+++ b/src/zcl_abapgit_injector.clas.abap
@@ -34,7 +34,7 @@ CLASS zcl_abapgit_injector IMPLEMENTATION.
 
   METHOD set_tadir.
 
-    zcl_abapgit_factory=>mi_tadir = ii_tadir.
+    zcl_abapgit_factory=>gi_tadir = ii_tadir.
 
   ENDMETHOD.
 
@@ -43,7 +43,7 @@ CLASS zcl_abapgit_injector IMPLEMENTATION.
     DATA: ls_sap_package TYPE zcl_abapgit_factory=>ty_sap_package.
     FIELD-SYMBOLS: <ls_sap_package> TYPE zcl_abapgit_factory=>ty_sap_package.
 
-    READ TABLE zcl_abapgit_factory=>mt_sap_package
+    READ TABLE zcl_abapgit_factory=>gt_sap_package
          ASSIGNING <ls_sap_package>
          WITH TABLE KEY package = iv_package.
 
@@ -51,7 +51,7 @@ CLASS zcl_abapgit_injector IMPLEMENTATION.
 
       ls_sap_package-package = iv_package.
       INSERT ls_sap_package
-             INTO TABLE zcl_abapgit_factory=>mt_sap_package
+             INTO TABLE zcl_abapgit_factory=>gt_sap_package
              ASSIGNING <ls_sap_package>.
 
     ENDIF.
@@ -62,10 +62,10 @@ CLASS zcl_abapgit_injector IMPLEMENTATION.
 
   METHOD set_code_inspector.
 
-    DATA: ls_code_inspector LIKE LINE OF zcl_abapgit_factory=>mt_code_inspector.
-    FIELD-SYMBOLS: <ls_code_inspector> LIKE LINE OF zcl_abapgit_factory=>mt_code_inspector.
+    DATA: ls_code_inspector LIKE LINE OF zcl_abapgit_factory=>gt_code_inspector.
+    FIELD-SYMBOLS: <ls_code_inspector> LIKE LINE OF zcl_abapgit_factory=>gt_code_inspector.
 
-    READ TABLE zcl_abapgit_factory=>mt_code_inspector
+    READ TABLE zcl_abapgit_factory=>gt_code_inspector
          ASSIGNING <ls_code_inspector>
          WITH TABLE KEY package            = iv_package
                         check_variant_name = iv_check_variant_name.
@@ -75,7 +75,7 @@ CLASS zcl_abapgit_injector IMPLEMENTATION.
       ls_code_inspector-check_variant_name = iv_check_variant_name.
 
       INSERT ls_code_inspector
-             INTO TABLE zcl_abapgit_factory=>mt_code_inspector
+             INTO TABLE zcl_abapgit_factory=>gt_code_inspector
              ASSIGNING <ls_code_inspector>.
 
     ENDIF.
@@ -86,10 +86,10 @@ CLASS zcl_abapgit_injector IMPLEMENTATION.
 
   METHOD set_syntax_check.
 
-    DATA: ls_syntax_check LIKE LINE OF zcl_abapgit_factory=>mt_syntax_check.
-    FIELD-SYMBOLS: <ls_syntax_check> LIKE LINE OF zcl_abapgit_factory=>mt_syntax_check.
+    DATA: ls_syntax_check LIKE LINE OF zcl_abapgit_factory=>gt_syntax_check.
+    FIELD-SYMBOLS: <ls_syntax_check> LIKE LINE OF zcl_abapgit_factory=>gt_syntax_check.
 
-    READ TABLE zcl_abapgit_factory=>mt_syntax_check
+    READ TABLE zcl_abapgit_factory=>gt_syntax_check
          ASSIGNING <ls_syntax_check>
          WITH TABLE KEY package = iv_package.
     IF sy-subrc <> 0.
@@ -97,7 +97,7 @@ CLASS zcl_abapgit_injector IMPLEMENTATION.
       ls_syntax_check-package = iv_package.
 
       INSERT ls_syntax_check
-             INTO TABLE zcl_abapgit_factory=>mt_syntax_check
+             INTO TABLE zcl_abapgit_factory=>gt_syntax_check
              ASSIGNING <ls_syntax_check>.
 
     ENDIF.