diff --git a/abaplint.json b/abaplint.json
index 793348316..efa211dd1 100644
--- a/abaplint.json
+++ b/abaplint.json
@@ -113,7 +113,7 @@
       "check": ["^stringtab$", "^SYCHAR01$", "^char2$", "^char20$", "^int4$", "^SYREPID$",
         "^flag$", "^char12$", "^char10$", "^char70$", "^char4$", "^sydatum$", "^syuzeit$",
         "^syst_title$", "^sychar70$", "^char30$", "^char50$",
-        "^numc2$", "^sap_bool$", "^SYCHAR10$", "^sylangu$",
+        "^numc2$", "^sap_bool$", "^SYCHAR10$", "^sylangu$", "^langu$",
         "^cl_blue_wb_utility$", "^boole_d$",
         "^cl_srvd_wb_object_data$",
         "^cl_wb_object_operator_factory$",
diff --git a/src/objects/core/zcl_abapgit_serialize.clas.abap b/src/objects/core/zcl_abapgit_serialize.clas.abap
index 11a081faa..8914400c7 100644
--- a/src/objects/core/zcl_abapgit_serialize.clas.abap
+++ b/src/objects/core/zcl_abapgit_serialize.clas.abap
@@ -14,7 +14,7 @@ CLASS zcl_abapgit_serialize DEFINITION
     METHODS serialize
       IMPORTING
         !it_tadir            TYPE zif_abapgit_definitions=>ty_tadir_tt
-        !iv_language         TYPE langu DEFAULT sy-langu
+        !iv_language         TYPE sy-langu DEFAULT sy-langu
         !ii_log              TYPE REF TO zif_abapgit_log OPTIONAL
         !iv_force_sequential TYPE abap_bool DEFAULT abap_false
       RETURNING
@@ -83,14 +83,14 @@ CLASS zcl_abapgit_serialize DEFINITION
     METHODS run_parallel
       IMPORTING
         !is_tadir    TYPE zif_abapgit_definitions=>ty_tadir
-        !iv_language TYPE langu
+        !iv_language TYPE sy-langu
         !iv_task     TYPE ty_char32
       RAISING
         zcx_abapgit_exception .
     METHODS run_sequential
       IMPORTING
         !is_tadir    TYPE zif_abapgit_definitions=>ty_tadir
-        !iv_language TYPE langu
+        !iv_language TYPE sy-langu
       RAISING
         zcx_abapgit_exception .
     METHODS add_objects
diff --git a/src/objects/texts/zif_abapgit_lang_definitions.intf.abap b/src/objects/texts/zif_abapgit_lang_definitions.intf.abap
index b6d5245e2..36394d36e 100644
--- a/src/objects/texts/zif_abapgit_lang_definitions.intf.abap
+++ b/src/objects/texts/zif_abapgit_lang_definitions.intf.abap
@@ -2,17 +2,17 @@ INTERFACE zif_abapgit_lang_definitions
   PUBLIC .
 
   TYPES: BEGIN OF ty_i18n_tpool,
-           language TYPE langu,
+           language TYPE sy-langu,
            textpool TYPE zif_abapgit_definitions=>ty_tpool_tt,
          END OF ty_i18n_tpool,
          ty_i18n_tpools TYPE STANDARD TABLE OF ty_i18n_tpool.
 
   TYPES: BEGIN OF ty_i18n_line,
-           language TYPE langu,
+           language TYPE sy-langu,
            lines    TYPE tlinetab,
          END OF ty_i18n_line,
          ty_i18n_lines TYPE STANDARD TABLE OF ty_i18n_line.
 
-  TYPES: ty_langus TYPE STANDARD TABLE OF langu.
+  TYPES: ty_langus TYPE STANDARD TABLE OF sy-langu.
 
 ENDINTERFACE.
diff --git a/src/objects/texts/zif_abapgit_longtexts.intf.abap b/src/objects/texts/zif_abapgit_longtexts.intf.abap
index ebe96dc5d..9106d5cdb 100644
--- a/src/objects/texts/zif_abapgit_longtexts.intf.abap
+++ b/src/objects/texts/zif_abapgit_longtexts.intf.abap
@@ -24,7 +24,7 @@ INTERFACE zif_abapgit_longtexts
     IMPORTING
       !iv_longtext_name TYPE string DEFAULT 'LONGTEXTS'
       !ii_xml           TYPE REF TO zif_abapgit_xml_input
-      !iv_main_language TYPE langu
+      !iv_main_language TYPE sy-langu
     RAISING
       zcx_abapgit_exception .
   METHODS delete
diff --git a/src/objects/zcl_abapgit_object_clas.clas.abap b/src/objects/zcl_abapgit_object_clas.clas.abap
index 8bb4f29d2..9cdf5f01c 100644
--- a/src/objects/zcl_abapgit_object_clas.clas.abap
+++ b/src/objects/zcl_abapgit_object_clas.clas.abap
@@ -360,7 +360,7 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION.
   METHOD serialize_docu.
 
     DATA: lt_lines      TYPE tlinetab,
-          lv_langu      TYPE langu,
+          lv_langu      TYPE sy-langu,
           lt_i18n_lines TYPE zif_abapgit_lang_definitions=>ty_i18n_lines,
           ls_i18n_lines TYPE zif_abapgit_lang_definitions=>ty_i18n_line.
 
@@ -407,7 +407,7 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION.
   METHOD serialize_tpool.
 
     DATA: lt_tpool      TYPE textpool_table,
-          lv_langu      TYPE langu,
+          lv_langu      TYPE sy-langu,
           lt_i18n_tpool TYPE zif_abapgit_lang_definitions=>ty_i18n_tpools,
           ls_i18n_tpool TYPE zif_abapgit_lang_definitions=>ty_i18n_tpool.
 
diff --git a/src/objects/zcl_abapgit_object_doma.clas.abap b/src/objects/zcl_abapgit_object_doma.clas.abap
index ab2309e3d..ebafc0bb9 100644
--- a/src/objects/zcl_abapgit_object_doma.clas.abap
+++ b/src/objects/zcl_abapgit_object_doma.clas.abap
@@ -55,7 +55,7 @@ CLASS zcl_abapgit_object_doma IMPLEMENTATION.
           lv_valpos     TYPE valpos,
           ls_dd01v_tmp  TYPE dd01v,
           lt_dd07v_tmp  TYPE TABLE OF dd07v,
-          lt_i18n_langs TYPE TABLE OF langu,
+          lt_i18n_langs TYPE TABLE OF sy-langu,
           lt_dd01_texts TYPE ty_dd01_texts,
           lt_dd07_texts TYPE ty_dd07_texts.
 
@@ -133,7 +133,7 @@ CLASS zcl_abapgit_object_doma IMPLEMENTATION.
           lv_index      TYPE i,
           ls_dd01v      TYPE dd01v,
           lt_dd07v      TYPE TABLE OF dd07v,
-          lt_i18n_langs TYPE TABLE OF langu,
+          lt_i18n_langs TYPE TABLE OF sy-langu,
           lt_dd01_texts TYPE ty_dd01_texts,
           lt_dd07_texts TYPE ty_dd07_texts.
 
diff --git a/src/objects/zcl_abapgit_object_dtel.clas.abap b/src/objects/zcl_abapgit_object_dtel.clas.abap
index 7b75aba0c..948d62288 100644
--- a/src/objects/zcl_abapgit_object_dtel.clas.abap
+++ b/src/objects/zcl_abapgit_object_dtel.clas.abap
@@ -43,7 +43,7 @@ CLASS zcl_abapgit_object_dtel IMPLEMENTATION.
 
     DATA: lv_name       TYPE ddobjname,
           ls_dd04v_tmp  TYPE dd04v,
-          lt_i18n_langs TYPE TABLE OF langu,
+          lt_i18n_langs TYPE TABLE OF sy-langu,
           lt_dd04_texts TYPE ty_dd04_texts.
 
     FIELD-SYMBOLS: <lv_lang>      LIKE LINE OF lt_i18n_langs,
@@ -95,7 +95,7 @@ CLASS zcl_abapgit_object_dtel IMPLEMENTATION.
           lv_index      TYPE i,
           ls_dd04v      TYPE dd04v,
           lt_dd04_texts TYPE ty_dd04_texts,
-          lt_i18n_langs TYPE TABLE OF langu.
+          lt_i18n_langs TYPE TABLE OF sy-langu.
 
     FIELD-SYMBOLS: <lv_lang>      LIKE LINE OF lt_i18n_langs,
                    <ls_dd04_text> LIKE LINE OF lt_dd04_texts.
diff --git a/src/objects/zcl_abapgit_object_fugr.clas.abap b/src/objects/zcl_abapgit_object_fugr.clas.abap
index fc5a3c17e..8ea2d4bc6 100644
--- a/src/objects/zcl_abapgit_object_fugr.clas.abap
+++ b/src/objects/zcl_abapgit_object_fugr.clas.abap
@@ -31,7 +31,7 @@ CLASS zcl_abapgit_object_fugr DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
       ty_sobj_name_tt TYPE STANDARD TABLE OF sobj_name  WITH DEFAULT KEY .
     TYPES:
       BEGIN OF ty_tpool_i18n,
-        language TYPE langu,
+        language TYPE sy-langu,
         textpool TYPE zif_abapgit_definitions=>ty_tpool_tt,
       END OF ty_tpool_i18n .
     TYPES:
diff --git a/src/objects/zcl_abapgit_object_msag.clas.abap b/src/objects/zcl_abapgit_object_msag.clas.abap
index 932061e16..54eddc294 100644
--- a/src/objects/zcl_abapgit_object_msag.clas.abap
+++ b/src/objects/zcl_abapgit_object_msag.clas.abap
@@ -212,7 +212,7 @@ CLASS zcl_abapgit_object_msag IMPLEMENTATION.
     DATA: lv_msg_id     TYPE rglif-message_id,
           lt_t100_texts TYPE ty_t100_texts,
           lt_t100t      TYPE TABLE OF t100t,
-          lt_i18n_langs TYPE TABLE OF langu.
+          lt_i18n_langs TYPE TABLE OF sy-langu.
 
     lv_msg_id = ms_item-obj_name.
 
diff --git a/src/objects/zcl_abapgit_object_nspc.clas.abap b/src/objects/zcl_abapgit_object_nspc.clas.abap
index b14d4153c..b3d22f8b4 100644
--- a/src/objects/zcl_abapgit_object_nspc.clas.abap
+++ b/src/objects/zcl_abapgit_object_nspc.clas.abap
@@ -66,7 +66,7 @@ CLASS zcl_abapgit_object_nspc IMPLEMENTATION.
 
     DATA:
       ls_trnspacett TYPE trnspacett,
-      lt_i18n_langs TYPE TABLE OF langu,
+      lt_i18n_langs TYPE TABLE OF sy-langu,
       lt_nspc_texts TYPE ty_nspc_texts.
 
     FIELD-SYMBOLS:
@@ -107,7 +107,7 @@ CLASS zcl_abapgit_object_nspc IMPLEMENTATION.
     DATA:
       ls_trnspacett TYPE trnspacett,
       lt_nspc_texts TYPE ty_nspc_texts,
-      lt_i18n_langs TYPE TABLE OF langu.
+      lt_i18n_langs TYPE TABLE OF sy-langu.
 
     FIELD-SYMBOLS:
       <lv_lang>      LIKE LINE OF lt_i18n_langs,
diff --git a/src/objects/zcl_abapgit_object_prog.clas.abap b/src/objects/zcl_abapgit_object_prog.clas.abap
index 016cdeff7..fce65e742 100644
--- a/src/objects/zcl_abapgit_object_prog.clas.abap
+++ b/src/objects/zcl_abapgit_object_prog.clas.abap
@@ -9,7 +9,7 @@ CLASS zcl_abapgit_object_prog DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
 
     TYPES:
       BEGIN OF ty_tpool_i18n,
-        language TYPE langu,
+        language TYPE sy-langu,
         textpool TYPE zif_abapgit_definitions=>ty_tpool_tt,
       END OF ty_tpool_i18n .
     TYPES:
diff --git a/src/objects/zcl_abapgit_object_tabl.clas.abap b/src/objects/zcl_abapgit_object_tabl.clas.abap
index 23886b807..a2ae8418f 100644
--- a/src/objects/zcl_abapgit_object_tabl.clas.abap
+++ b/src/objects/zcl_abapgit_object_tabl.clas.abap
@@ -399,7 +399,7 @@ CLASS zcl_abapgit_object_tabl IMPLEMENTATION.
 
     DATA: lv_name       TYPE ddobjname,
           ls_dd02v_tmp  TYPE dd02v,
-          lt_i18n_langs TYPE TABLE OF langu,
+          lt_i18n_langs TYPE TABLE OF sy-langu,
           lt_dd02_texts TYPE ty_dd02_texts.
 
     FIELD-SYMBOLS: <lv_lang>      LIKE LINE OF lt_i18n_langs,
@@ -546,7 +546,7 @@ CLASS zcl_abapgit_object_tabl IMPLEMENTATION.
           lv_index      TYPE i,
           ls_dd02v      TYPE dd02v,
           lt_dd02_texts TYPE ty_dd02_texts,
-          lt_i18n_langs TYPE TABLE OF langu.
+          lt_i18n_langs TYPE TABLE OF sy-langu.
 
     FIELD-SYMBOLS: <lv_lang>      LIKE LINE OF lt_i18n_langs,
                    <ls_dd02_text> LIKE LINE OF lt_dd02_texts.
diff --git a/src/objects/zcl_abapgit_objects_program.clas.abap b/src/objects/zcl_abapgit_objects_program.clas.abap
index 33b2c3310..65a213408 100644
--- a/src/objects/zcl_abapgit_objects_program.clas.abap
+++ b/src/objects/zcl_abapgit_objects_program.clas.abap
@@ -106,7 +106,7 @@ CLASS zcl_abapgit_objects_program DEFINITION PUBLIC INHERITING FROM zcl_abapgit_
       IMPORTING
         !iv_program    TYPE programm
         !it_tpool      TYPE textpool_table
-        !iv_language   TYPE langu OPTIONAL
+        !iv_language   TYPE sy-langu OPTIONAL
         !iv_is_include TYPE abap_bool DEFAULT abap_false
       RAISING
         zcx_abapgit_exception .
@@ -472,7 +472,7 @@ CLASS zcl_abapgit_objects_program IMPLEMENTATION.
 
   METHOD deserialize_textpool.
 
-    DATA lv_language TYPE langu.
+    DATA lv_language TYPE sy-langu.
     DATA lv_state    TYPE c.
     DATA lv_delete   TYPE abap_bool.
 
diff --git a/src/utils/zcl_abapgit_language.clas.abap b/src/utils/zcl_abapgit_language.clas.abap
index ecfb570e4..dde233462 100644
--- a/src/utils/zcl_abapgit_language.clas.abap
+++ b/src/utils/zcl_abapgit_language.clas.abap
@@ -14,11 +14,11 @@ CLASS zcl_abapgit_language DEFINITION
     CLASS-METHODS restore_login_language .
     CLASS-METHODS set_current_language
       IMPORTING
-        !iv_language TYPE langu .
+        !iv_language TYPE sy-langu .
   PROTECTED SECTION.
   PRIVATE SECTION.
 
-    CLASS-DATA gv_login_language TYPE langu .
+    CLASS-DATA gv_login_language TYPE sy-langu .
 ENDCLASS.