diff --git a/src/background/zcl_abapgit_background_push_au.clas.abap b/src/background/zcl_abapgit_background_push_au.clas.abap
index 946aa62bf..6302ffd7c 100644
--- a/src/background/zcl_abapgit_background_push_au.clas.abap
+++ b/src/background/zcl_abapgit_background_push_au.clas.abap
@@ -69,12 +69,12 @@ CLASS zcl_abapgit_background_push_au IMPLEMENTATION.
 
   METHOD determine_user_details.
 
-    DATA: lo_user_record TYPE REF TO zcl_abapgit_user_record.
+    DATA li_user_record TYPE REF TO zif_abapgit_user_record.
 
 
-    lo_user_record = zcl_abapgit_user_record=>get_instance( ).
-    rs_user-name = lo_user_record->get_name( iv_changed_by ).
-    rs_user-email = lo_user_record->get_email( iv_changed_by ).
+    li_user_record = zcl_abapgit_user_record=>get_instance( ).
+    rs_user-name = li_user_record->get_name( iv_changed_by ).
+    rs_user-email = li_user_record->get_email( iv_changed_by ).
 
 *   If no email, fall back to localhost/default email
     IF rs_user-email IS INITIAL.
diff --git a/src/env/zcl_abapgit_user_record.clas.abap b/src/env/zcl_abapgit_user_record.clas.abap
index a072bbd1f..af4efe7b6 100644
--- a/src/env/zcl_abapgit_user_record.clas.abap
+++ b/src/env/zcl_abapgit_user_record.clas.abap
@@ -7,7 +7,7 @@ CLASS zcl_abapgit_user_record DEFINITION
     CLASS-METHODS reset.
     CLASS-METHODS get_instance
       RETURNING
-        VALUE(ro_user) TYPE REF TO zcl_abapgit_user_record.
+        VALUE(ri_user) TYPE REF TO zif_abapgit_user_record.
 
     INTERFACES zif_abapgit_user_record.
 
@@ -54,7 +54,7 @@ ENDCLASS.
 
 CLASS zcl_abapgit_user_record IMPLEMENTATION.
   METHOD get_instance.
-    CREATE OBJECT ro_user.
+    CREATE OBJECT ri_user TYPE zcl_abapgit_user_record.
   ENDMETHOD.
 
 
diff --git a/src/env/zcl_abapgit_user_record.clas.testclasses.abap b/src/env/zcl_abapgit_user_record.clas.testclasses.abap
index 72ab1eb1f..054304fc4 100644
--- a/src/env/zcl_abapgit_user_record.clas.testclasses.abap
+++ b/src/env/zcl_abapgit_user_record.clas.testclasses.abap
@@ -16,10 +16,10 @@ ENDCLASS.
 CLASS ltcl_user_record IMPLEMENTATION.
 
   METHOD test_invalid_user.
-    DATA: lo_user_record TYPE REF TO zcl_abapgit_user_record.
+    DATA li_user_record TYPE REF TO zif_abapgit_user_record.
 
     zcl_abapgit_user_record=>reset( ).
-    lo_user_record = zcl_abapgit_user_record=>get_instance( ).
+    li_user_record = zcl_abapgit_user_record=>get_instance( ).
 
     cl_abap_unit_assert=>assert_equals(
       exp = 0