diff --git a/abaplint.json b/abaplint.json
index dcb6c086a..33dce0f6a 100644
--- a/abaplint.json
+++ b/abaplint.json
@@ -68,7 +68,7 @@
     "local_testclass_consistency": true,
     "no_external_form_calls": false,
     "no_inline_in_optional_branches": true,
-    "pragma_style": false,
+    "pragma_style": true,
     "slow_parameter_passing": false,
     "unnecessary_pragma": false,
     "align_parameters": false,
diff --git a/src/objects/zcl_abapgit_object_form.clas.abap b/src/objects/zcl_abapgit_object_form.clas.abap
index 95405fdb5..710d6f1fb 100644
--- a/src/objects/zcl_abapgit_object_form.clas.abap
+++ b/src/objects/zcl_abapgit_object_form.clas.abap
@@ -194,7 +194,7 @@ CLASS zcl_abapgit_object_form IMPLEMENTATION.
       TABLES
         selections    = rt_text_header
       EXCEPTIONS
-        OTHERS        = 1 ##fm_subrc_ok.  "#EC CI_SUBRC
+        OTHERS        = 1 ##FM_SUBRC_OK.  "#EC CI_SUBRC
 
   ENDMETHOD.
 
@@ -510,8 +510,7 @@ CLASS zcl_abapgit_object_form IMPLEMENTATION.
         object    = cs_form_data-text_header-tdobject
         olanguage = cs_form_data-orig_language
       EXCEPTIONS
-        OTHERS    = 1
-        ##fm_subrc_ok.                                                   "#EC CI_SUBRC
+        OTHERS    = 1 ##FM_SUBRC_OK.                                                   "#EC CI_SUBRC
 
   ENDMETHOD.
 
diff --git a/src/objects/zcl_abapgit_object_intf.clas.abap b/src/objects/zcl_abapgit_object_intf.clas.abap
index 9e318b5de..6d1b04caf 100644
--- a/src/objects/zcl_abapgit_object_intf.clas.abap
+++ b/src/objects/zcl_abapgit_object_intf.clas.abap
@@ -410,7 +410,7 @@ CLASS ZCL_ABAPGIT_OBJECT_INTF IMPLEMENTATION.
       SELECT SINGLE category FROM seoclassdf INTO lv_category
         WHERE clsname = ls_class_key-clsname
         AND ( version = '1'
-        OR version = '0' ) ##warn_ok.                   "#EC CI_GENBUFF
+        OR version = '0' ) ##WARN_OK.                   "#EC CI_GENBUFF
       IF sy-subrc = 0 AND lv_category = seoc_category_webdynpro_class.
         rv_bool = abap_false.
       ENDIF.
diff --git a/src/objects/zcl_abapgit_object_msag.clas.abap b/src/objects/zcl_abapgit_object_msag.clas.abap
index c1d42646e..5fa342176 100644
--- a/src/objects/zcl_abapgit_object_msag.clas.abap
+++ b/src/objects/zcl_abapgit_object_msag.clas.abap
@@ -362,7 +362,7 @@ CLASS zcl_abapgit_object_msag IMPLEMENTATION.
         zcx_abapgit_exception=>raise( 'MSAG: Table T100 modify failed' ).
       ENDIF.
       CLEAR ls_t100u.
-      MOVE-CORRESPONDING <ls_t100> TO ls_t100u ##enh_ok.
+      MOVE-CORRESPONDING <ls_t100> TO ls_t100u ##ENH_OK.
       ls_t100u-name    = sy-uname.
       ls_t100u-datum   = sy-datum.
       ls_t100u-selfdef = '3'.
diff --git a/src/objects/zcl_abapgit_object_ssfo.clas.abap b/src/objects/zcl_abapgit_object_ssfo.clas.abap
index fdec1a5f4..62fd6bc20 100644
--- a/src/objects/zcl_abapgit_object_ssfo.clas.abap
+++ b/src/objects/zcl_abapgit_object_ssfo.clas.abap
@@ -55,7 +55,7 @@ CLASS zcl_abapgit_object_ssfo IMPLEMENTATION.
         TRY.
             ei_code_item_element ?= ii_node.
             RETURN.
-          CATCH cx_sy_move_cast_error ##no_handler.
+          CATCH cx_sy_move_cast_error ##NO_HANDLER.
         ENDTRY.
 
       ELSEIF iv_name NOT IN get_range_node_codes( ) AND
@@ -184,7 +184,7 @@ CLASS zcl_abapgit_object_ssfo IMPLEMENTATION.
           SHIFT lv_coding_line RIGHT BY lv_leading_spaces PLACES.
           li_element->set_value( lv_coding_line ).
         ENDIF.
-      CATCH zcx_abapgit_exception ##no_handler.
+      CATCH zcx_abapgit_exception ##NO_HANDLER.
     ENDTRY.
 
   ENDMETHOD.
diff --git a/src/objects/zcl_abapgit_object_webi.clas.abap b/src/objects/zcl_abapgit_object_webi.clas.abap
index 07c1d0a04..118e1f94e 100644
--- a/src/objects/zcl_abapgit_object_webi.clas.abap
+++ b/src/objects/zcl_abapgit_object_webi.clas.abap
@@ -402,7 +402,7 @@ CLASS zcl_abapgit_object_webi IMPLEMENTATION.
       CATCH cx_ws_md_exception INTO lx_root.
         TRY.
             mi_vi->if_ws_md_lockable_object~unlock( ).
-          CATCH cx_ws_md_exception ##no_handler.
+          CATCH cx_ws_md_exception ##NO_HANDLER.
         ENDTRY.
         zcx_abapgit_exception=>raise_with_text( lx_root ).
     ENDTRY.
diff --git a/src/objects/zcl_abapgit_objects_program.clas.abap b/src/objects/zcl_abapgit_objects_program.clas.abap
index cb2e22ecd..163544b31 100644
--- a/src/objects/zcl_abapgit_objects_program.clas.abap
+++ b/src/objects/zcl_abapgit_objects_program.clas.abap
@@ -290,7 +290,7 @@ CLASS zcl_abapgit_objects_program IMPLEMENTATION.
     ls_adm = is_cua-adm.
     auto_correct_cua_adm( EXPORTING is_cua = is_cua CHANGING cs_adm = ls_adm ).
 
-    sy-tcode = 'SE41' ##write_ok. " evil hack, workaround to handle fixes in note 2159455
+    sy-tcode = 'SE41' ##WRITE_OK. " evil hack, workaround to handle fixes in note 2159455
     CALL FUNCTION 'RS_CUA_INTERNAL_WRITE'
       EXPORTING
         program   = iv_program_name