diff --git a/src/git/zcl_abapgit_git_pack.clas.abap b/src/git/zcl_abapgit_git_pack.clas.abap
index 7ca440f02..867049bff 100644
--- a/src/git/zcl_abapgit_git_pack.clas.abap
+++ b/src/git/zcl_abapgit_git_pack.clas.abap
@@ -737,9 +737,9 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION.
   METHOD encode_tag.
 
     DATA: lv_string TYPE string,
-          lv_time   TYPE zcl_abapgit_time=>ty_unixtime.
+          lv_time   TYPE zcl_abapgit_git_time=>ty_unixtime.
 
-    lv_time = zcl_abapgit_time=>get_unix( ).
+    lv_time = zcl_abapgit_git_time=>get_unix( ).
 
     lv_string = |object { is_tag-object }{ zif_abapgit_definitions=>c_newline }|
              && |type { is_tag-type }{ zif_abapgit_definitions=>c_newline }|
diff --git a/src/git/zcl_abapgit_git_porcelain.clas.abap b/src/git/zcl_abapgit_git_porcelain.clas.abap
index b5f2c9258..8a9cd70ec 100644
--- a/src/git/zcl_abapgit_git_porcelain.clas.abap
+++ b/src/git/zcl_abapgit_git_porcelain.clas.abap
@@ -605,7 +605,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
 
   METHOD receive_pack_push.
 
-    DATA: lv_time   TYPE zcl_abapgit_time=>ty_unixtime,
+    DATA: lv_time   TYPE zcl_abapgit_git_time=>ty_unixtime,
           lv_commit TYPE xstring,
           lv_pack   TYPE xstring,
           ls_object LIKE LINE OF et_new_objects,
@@ -616,7 +616,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
                    <ls_blob> LIKE LINE OF it_blobs.
 
 
-    lv_time = zcl_abapgit_time=>get_unix( ).
+    lv_time = zcl_abapgit_git_time=>get_unix( ).
 
     READ TABLE it_trees ASSIGNING <ls_tree> WITH KEY path = '/'.
     ASSERT sy-subrc = 0.
diff --git a/src/utils/zcl_abapgit_time.clas.abap b/src/git/zcl_abapgit_git_time.clas.abap
similarity index 94%
rename from src/utils/zcl_abapgit_time.clas.abap
rename to src/git/zcl_abapgit_git_time.clas.abap
index c88774cab..ada27fb23 100644
--- a/src/utils/zcl_abapgit_time.clas.abap
+++ b/src/git/zcl_abapgit_git_time.clas.abap
@@ -1,4 +1,4 @@
-CLASS zcl_abapgit_time DEFINITION
+CLASS zcl_abapgit_git_time DEFINITION
   PUBLIC
   FINAL
   CREATE PUBLIC .
@@ -25,7 +25,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_TIME IMPLEMENTATION.
+CLASS zcl_abapgit_git_time IMPLEMENTATION.
 
 
   METHOD get_unix.
diff --git a/src/utils/zcl_abapgit_time.clas.testclasses.abap b/src/git/zcl_abapgit_git_time.clas.testclasses.abap
similarity index 82%
rename from src/utils/zcl_abapgit_time.clas.testclasses.abap
rename to src/git/zcl_abapgit_git_time.clas.testclasses.abap
index 0ba7aeb45..7baed1f94 100644
--- a/src/utils/zcl_abapgit_time.clas.testclasses.abap
+++ b/src/git/zcl_abapgit_git_time.clas.testclasses.abap
@@ -13,9 +13,9 @@ CLASS ltcl_time_test IMPLEMENTATION.
 
   METHOD get_unix.
 
-    DATA: lv_time TYPE zcl_abapgit_time=>ty_unixtime.
+    DATA: lv_time TYPE zcl_abapgit_git_time=>ty_unixtime.
 
-    lv_time = zcl_abapgit_time=>get_unix( ).
+    lv_time = zcl_abapgit_git_time=>get_unix( ).
 
     cl_abap_unit_assert=>assert_not_initial( lv_time ).
 
@@ -27,7 +27,7 @@ CLASS ltcl_time_test IMPLEMENTATION.
     DATA: lv_date TYPE sy-datum,
           lv_time TYPE sy-uzeit.
 
-    zcl_abapgit_time=>get_utc(
+    zcl_abapgit_git_time=>get_utc(
       EXPORTING
         iv_unix = '1574605521'
       IMPORTING
diff --git a/src/utils/zcl_abapgit_time.clas.xml b/src/git/zcl_abapgit_git_time.clas.xml
similarity index 91%
rename from src/utils/zcl_abapgit_time.clas.xml
rename to src/git/zcl_abapgit_git_time.clas.xml
index 6627aed92..ae72393f2 100644
--- a/src/utils/zcl_abapgit_time.clas.xml
+++ b/src/git/zcl_abapgit_git_time.clas.xml
@@ -3,7 +3,7 @@
  <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
   <asx:values>
    <VSEOCLASS>
-    <CLSNAME>ZCL_ABAPGIT_TIME</CLSNAME>
+    <CLSNAME>ZCL_ABAPGIT_GIT_TIME</CLSNAME>
     <LANGU>E</LANGU>
     <DESCRIPT>abapGit - Time Helpers</DESCRIPT>
     <STATE>1</STATE>
diff --git a/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap
index 787685a1e..14683324a 100644
--- a/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap
+++ b/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap
@@ -177,7 +177,7 @@ CLASS zcl_abapgit_gui_page_debuginfo IMPLEMENTATION.
     ri_html->add( |<tr><td>GUI version:    </td><td>{ lv_gui_version }</td></tr>| ).
     ri_html->add( |<tr><td>APACK version:  </td><td>{
                   zcl_abapgit_apack_migration=>c_apack_interface_version }</td></tr>| ).
-    ri_html->add( |<tr><td>LCL_TIME:       </td><td>{ zcl_abapgit_time=>get_unix( ) }</td></tr>| ).
+    ri_html->add( |<tr><td>LCL_TIME:       </td><td>{ zcl_abapgit_git_time=>get_unix( ) }</td></tr>| ).
     ri_html->add( |<tr><td>SY time:        </td><td>{ sy-datum } { sy-uzeit } { sy-tzone }</td></tr>| ).
     ri_html->add( |<tr><td>SY release:     </td><td>{ ls_release-release } SP { ls_release-sp }</td></tr>| ).
     ri_html->add( |</table>| ).
diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap
index 065dc3c61..727613c3f 100644
--- a/src/ui/zcl_abapgit_popups.clas.abap
+++ b/src/ui/zcl_abapgit_popups.clas.abap
@@ -161,7 +161,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
   METHOD commit_list_build.
 
     DATA:
-      lv_unix_time   TYPE zcl_abapgit_time=>ty_unixtime,
+      lv_unix_time   TYPE zcl_abapgit_git_time=>ty_unixtime,
       lv_date        TYPE d,
       lv_date_string TYPE c LENGTH 12,
       lv_time        TYPE t,
@@ -190,7 +190,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
       <ls_value_tab>-commit  = <ls_commit>-sha1.
       <ls_value_tab>-message = <ls_commit>-message.
       lv_unix_time = <ls_commit>-time.
-      zcl_abapgit_time=>get_utc(
+      zcl_abapgit_git_time=>get_utc(
         EXPORTING
           iv_unix = lv_unix_time
         IMPORTING