diff --git a/src/zabapgit_object_oo_factory.prog.abap b/src/zabapgit_object_oo_factory.prog.abap
index 9668924b1..06c7f5444 100644
--- a/src/zabapgit_object_oo_factory.prog.abap
+++ b/src/zabapgit_object_oo_factory.prog.abap
@@ -15,14 +15,15 @@ CLASS lcl_object_oriented_factory IMPLEMENTATION.
   ENDMETHOD.
 ENDCLASS.
 
-CLASS lth_oo_factory_injector DEFINITION FOR TESTING.
+CLASS ltcl_oo_factory_injector DEFINITION FOR TESTING.
   PUBLIC SECTION.
     CLASS-METHODS:
       inject
         IMPORTING
           io_object_oriented_object TYPE REF TO lif_object_oriented_object_fnc.
 ENDCLASS.
-CLASS lth_oo_factory_injector IMPLEMENTATION.
+
+CLASS ltcl_oo_factory_injector IMPLEMENTATION.
   METHOD inject.
     lcl_object_oriented_factory=>go_object_oriented_object = io_object_oriented_object.
   ENDMETHOD.
diff --git a/src/zabapgit_object_oo_functions.prog.abap b/src/zabapgit_object_oo_functions.prog.abap
index f0ac47638..f22093cd1 100644
--- a/src/zabapgit_object_oo_functions.prog.abap
+++ b/src/zabapgit_object_oo_functions.prog.abap
@@ -611,10 +611,11 @@ CLASS lcl_object_oriented_base IMPLEMENTATION.
 ENDCLASS.
 
 "Backdoor injection for test purposes
-CLASS lth_oo_factory_injector DEFINITION DEFERRED.
+CLASS ltcl_oo_factory_injector DEFINITION DEFERRED.
 
 CLASS lcl_object_oriented_factory DEFINITION
-  FRIENDS lth_oo_factory_injector.
+  FRIENDS ltcl_oo_factory_injector.
+
   PUBLIC SECTION.
     CLASS-METHODS:
       make
diff --git a/src/zabapgit_requirements.prog.abap b/src/zabapgit_requirements.prog.abap
index 782a71dfa..234410825 100644
--- a/src/zabapgit_requirements.prog.abap
+++ b/src/zabapgit_requirements.prog.abap
@@ -2,7 +2,6 @@
 *&  Include  zabapgit_requirements
 *&---------------------------------------------------------------------*
 
-"! Helper class for checking requirements / dependencies
 *----------------------------------------------------------------------*
 *       CLASS lcl_requirement_helper DEFINITION
 *----------------------------------------------------------------------*
diff --git a/src/zabapgit_unit_test.prog.abap b/src/zabapgit_unit_test.prog.abap
index c82efc042..0661a8377 100644
--- a/src/zabapgit_unit_test.prog.abap
+++ b/src/zabapgit_unit_test.prog.abap
@@ -108,13 +108,13 @@ CLASS ltcl_convert IMPLEMENTATION.
 
 ENDCLASS.                    "ltcl_convert IMPLEMENTATION
 
-CLASS lth_critical_tests DEFINITION FINAL.
+CLASS ltcl_critical_tests DEFINITION FINAL FOR TESTING.
   PUBLIC SECTION.
     CLASS-METHODS:
       check_run_permission.
 ENDCLASS.
 
-CLASS lth_critical_tests IMPLEMENTATION.
+CLASS ltcl_critical_tests IMPLEMENTATION.
 
   METHOD check_run_permission.
     DATA: lo_settings TYPE REF TO lcl_settings.
@@ -162,7 +162,7 @@ ENDCLASS.                    "ltcl_dangerous DEFINITION
 CLASS ltcl_dangerous IMPLEMENTATION.
 
   METHOD class_setup.
-    lth_critical_tests=>check_run_permission( ).
+    ltcl_critical_tests=>check_run_permission( ).
   ENDMETHOD.                    "class_setup
 
   METHOD run.
@@ -2164,9 +2164,11 @@ CLASS ltcl_persistence_settings DEFINITION FINAL FOR TESTING
 ENDCLASS.
 
 CLASS ltcl_persistence_settings IMPLEMENTATION.
+
   METHOD class_setup.
-    lth_critical_tests=>check_run_permission( ).
+    ltcl_critical_tests=>check_run_permission( ).
   ENDMETHOD.
+
   METHOD setup.
     CREATE OBJECT mo_persistence_settings.
     CREATE OBJECT mo_settings.
diff --git a/src/zabapgit_unit_test_clas_intf.prog.abap b/src/zabapgit_unit_test_clas_intf.prog.abap
index 3f424b432..cac3a44e1 100644
--- a/src/zabapgit_unit_test_clas_intf.prog.abap
+++ b/src/zabapgit_unit_test_clas_intf.prog.abap
@@ -342,7 +342,7 @@ CLASS ltcl_class_deserialization IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     CREATE OBJECT mo_xml_out.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zcl_class'.
@@ -544,7 +544,7 @@ CLASS ltcl_interface_deserialization IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     CREATE OBJECT mo_xml_out.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zif_interface'.
@@ -648,7 +648,7 @@ CLASS ltcl_class_changed IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     CREATE OBJECT mo_xml_out.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zcl_class'.
@@ -695,7 +695,7 @@ CLASS ltcl_interface_changed IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     CREATE OBJECT mo_xml_out.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zif_interface'.
@@ -743,7 +743,7 @@ CLASS ltcl_exists_test IMPLEMENTATION.
   METHOD setup.
     CREATE OBJECT mo_spy_oo_object_functions.
     me->mo_spy_oo_object_functions->mv_exists = abap_true.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
   ENDMETHOD.
 
   METHOD class_exists.
@@ -809,7 +809,7 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     me->mo_spy_oo_object_functions->mv_exists = abap_true.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zcl_class'.
@@ -1126,7 +1126,7 @@ CLASS ltcl_serialize_interface IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     me->mo_spy_oo_object_functions->mv_exists = abap_true.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zif_interface'.
@@ -1272,7 +1272,7 @@ CLASS ltcl_delete_oo_test IMPLEMENTATION.
   METHOD setup.
     CREATE OBJECT mo_spy_oo_object_functions.
     me->mo_spy_oo_object_functions->mv_exists = abap_true.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
   ENDMETHOD.
 
   METHOD class_delete.