diff --git a/abaplint.json b/abaplint.json
index ac14059f8..313ee46be 100644
--- a/abaplint.json
+++ b/abaplint.json
@@ -156,7 +156,8 @@
         "^if_srvd_types$", "^xubname$",
         "^if_wb_adt_plugin_resource_co$",
         "^if_wb_object_data_selection_co$",
-        "^if_wb_object_operator$"
+        "^if_wb_object_operator$",
+        "^cl_abap_syst"
       ]
     },
     "forbidden_identifier": true,
diff --git a/src/objects/core/zcl_abapgit_folder_logic.clas.abap b/src/objects/core/zcl_abapgit_folder_logic.clas.abap
index 6156b3a3d..c7ebf7590 100644
--- a/src/objects/core/zcl_abapgit_folder_logic.clas.abap
+++ b/src/objects/core/zcl_abapgit_folder_logic.clas.abap
@@ -178,7 +178,7 @@ CLASS zcl_abapgit_folder_logic IMPLEMENTATION.
       ELSE.
         ls_package-devclass = iv_top.
         ls_package-ctext = iv_top.
-        ls_package-as4user = cl_abap_syst=>get_user_name( ).
+        ls_package-as4user = sy-uname.
         zcl_abapgit_factory=>get_sap_package( iv_top )->create( ls_package ).
       ENDIF.
     ENDIF.
diff --git a/src/objects/zcl_abapgit_object_devc.clas.abap b/src/objects/zcl_abapgit_object_devc.clas.abap
index 2ddc5e09d..ecf43aace 100644
--- a/src/objects/zcl_abapgit_object_devc.clas.abap
+++ b/src/objects/zcl_abapgit_object_devc.clas.abap
@@ -540,7 +540,7 @@ CLASS zcl_abapgit_object_devc IMPLEMENTATION.
       ls_package_data-dlvunit = 'HOME'.
     ENDIF.
 
-    ls_package_data-as4user = cl_abap_syst=>get_user_name( ).
+    ls_package_data-as4user = sy-uname.
 
     IF li_package IS BOUND.
       " Package already exists, change it
diff --git a/src/objects/zcl_abapgit_object_iext.clas.abap b/src/objects/zcl_abapgit_object_iext.clas.abap
index ce9769e25..e1e9615a4 100644
--- a/src/objects/zcl_abapgit_object_iext.clas.abap
+++ b/src/objects/zcl_abapgit_object_iext.clas.abap
@@ -76,7 +76,7 @@ CLASS zcl_abapgit_object_iext IMPLEMENTATION.
                   CHANGING  cg_data = ls_extension ).
 
     MOVE-CORRESPONDING ls_extension-attributes TO ls_attributes.
-    ls_attributes-presp = cl_abap_syst=>get_user_name( ).
+    ls_attributes-presp = sy-uname.
     ls_attributes-pwork = ls_attributes-presp.
 
     IF zif_abapgit_object~exists( ) = abap_true.
diff --git a/src/objects/zcl_abapgit_object_tabl.clas.abap b/src/objects/zcl_abapgit_object_tabl.clas.abap
index e080f4a41..72f505e44 100644
--- a/src/objects/zcl_abapgit_object_tabl.clas.abap
+++ b/src/objects/zcl_abapgit_object_tabl.clas.abap
@@ -266,8 +266,8 @@ CLASS zcl_abapgit_object_tabl IMPLEMENTATION.
     lv_package = iv_package.
 
     LOOP AT lt_segment_definitions ASSIGNING <ls_segment_definition>.
-      <ls_segment_definition>-segmentheader-presp = cl_abap_syst=>get_user_name( ).
-      <ls_segment_definition>-segmentheader-pwork = cl_abap_syst=>get_user_name( ).
+      <ls_segment_definition>-segmentheader-presp = sy-uname.
+      <ls_segment_definition>-segmentheader-pwork = sy-uname.
 
       CALL FUNCTION 'SEGMENT_READ'
         EXPORTING
@@ -312,7 +312,7 @@ CLASS zcl_abapgit_object_tabl IMPLEMENTATION.
 
     ENDLOOP.
 
-    lv_uname = cl_abap_syst=>get_user_name( ).
+    lv_uname = sy-uname.
 
     CALL FUNCTION 'TR_TADIR_INTERFACE'
       EXPORTING