diff --git a/src/git/zcl_abapgit_tag.clas.abap b/src/git/zcl_abapgit_tag.clas.abap
new file mode 100644
index 000000000..1b00d7328
--- /dev/null
+++ b/src/git/zcl_abapgit_tag.clas.abap
@@ -0,0 +1,43 @@
+CLASS zcl_abapgit_tag DEFINITION
+  PUBLIC
+  CREATE PUBLIC .
+
+  PUBLIC SECTION.
+
+    CLASS-METHODS:
+      add_tag_prefix
+        IMPORTING
+          !iv_text       TYPE csequence
+        RETURNING
+          VALUE(rv_text) TYPE string,
+
+      remove_tag_prefix
+        IMPORTING
+          !iv_text       TYPE string
+        RETURNING
+          VALUE(rv_text) TYPE string .
+
+ENDCLASS.
+
+
+
+CLASS zcl_abapgit_tag IMPLEMENTATION.
+
+  METHOD add_tag_prefix.
+
+    rv_text = zif_abapgit_definitions=>gc_tag_prefix && iv_text.
+
+  ENDMETHOD.
+
+
+  METHOD remove_tag_prefix.
+
+    rv_text = iv_text.
+
+    REPLACE FIRST OCCURRENCE OF zif_abapgit_definitions=>gc_tag_prefix
+            IN rv_text
+            WITH ''.
+
+  ENDMETHOD.
+
+ENDCLASS.
diff --git a/src/git/zcl_abapgit_tag.clas.xml b/src/git/zcl_abapgit_tag.clas.xml
new file mode 100644
index 000000000..c4c7fac74
--- /dev/null
+++ b/src/git/zcl_abapgit_tag.clas.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>ZCL_ABAPGIT_TAG</CLSNAME>
+    <VERSION>1</VERSION>
+    <LANGU>E</LANGU>
+    <EXPOSURE>2</EXPOSURE>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+   <DESCRIPTIONS>
+    <SEOCOMPOTX>
+     <CLSNAME>ZCL_ABAPGIT_TAG</CLSNAME>
+     <CMPNAME>ADD_TAG_PREFIX</CMPNAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>ADD_TAG_PREFIX</DESCRIPT>
+    </SEOCOMPOTX>
+    <SEOCOMPOTX>
+     <CLSNAME>ZCL_ABAPGIT_TAG</CLSNAME>
+     <CMPNAME>REMOVE_TAG_PREFIX</CMPNAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>REMOVE_TAG_PREFIX</DESCRIPT>
+    </SEOCOMPOTX>
+   </DESCRIPTIONS>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_page_branch_overview.prog.abap b/src/zabapgit_page_branch_overview.prog.abap
index da0d83ca9..391e8e149 100644
--- a/src/zabapgit_page_branch_overview.prog.abap
+++ b/src/zabapgit_page_branch_overview.prog.abap
@@ -323,7 +323,7 @@ CLASS lcl_branch_overview IMPLEMENTATION.
                             ASSIGNING <ls_commit>.
       CHECK sy-subrc = 0.
 
-      lv_tag = lcl_tag=>remove_tag_prefix( <ls_tag>-name ).
+      lv_tag = zcl_abapgit_tag=>remove_tag_prefix( <ls_tag>-name ).
       INSERT lv_tag INTO TABLE <ls_commit>-tags.
 
     ENDLOOP.
diff --git a/src/zabapgit_popups.prog.abap b/src/zabapgit_popups.prog.abap
index 9d775fc6c..de2a654e9 100644
--- a/src/zabapgit_popups.prog.abap
+++ b/src/zabapgit_popups.prog.abap
@@ -341,7 +341,7 @@ CLASS lcl_popups IMPLEMENTATION.
       READ TABLE lt_fields WITH KEY fieldname = 'LINE'
                            ASSIGNING <ls_field>.
       ASSERT sy-subrc = 0.
-      ev_name = lcl_tag=>add_tag_prefix( <ls_field>-value ).
+      ev_name = zcl_abapgit_tag=>add_tag_prefix( <ls_field>-value ).
     ENDIF.
 
   ENDMETHOD.
@@ -598,7 +598,7 @@ CLASS lcl_popups IMPLEMENTATION.
       LOOP AT lt_tags ASSIGNING <ls_tag>.
 
         INSERT INITIAL LINE INTO lt_selection INDEX 1 ASSIGNING <ls_sel>.
-        <ls_sel>-varoption = lcl_tag=>remove_tag_prefix( <ls_tag>-name ).
+        <ls_sel>-varoption = zcl_abapgit_tag=>remove_tag_prefix( <ls_tag>-name ).
 
       ENDLOOP.
 
@@ -628,7 +628,7 @@ CLASS lcl_popups IMPLEMENTATION.
       READ TABLE lt_selection ASSIGNING <ls_sel> WITH KEY selflag = abap_true.
       ASSERT sy-subrc = 0.
 
-      lv_name_with_prefix = lcl_tag=>add_tag_prefix( <ls_sel>-varoption ).
+      lv_name_with_prefix = zcl_abapgit_tag=>add_tag_prefix( <ls_sel>-varoption ).
 
       READ TABLE lt_tags ASSIGNING <ls_tag> WITH KEY name = lv_name_with_prefix.
       ASSERT sy-subrc = 0.
@@ -639,7 +639,7 @@ CLASS lcl_popups IMPLEMENTATION.
 
       LOOP AT lt_tags ASSIGNING <ls_tag>.
 
-        <ls_tag>-name = lcl_tag=>remove_tag_prefix( <ls_tag>-name ).
+        <ls_tag>-name = zcl_abapgit_tag=>remove_tag_prefix( <ls_tag>-name ).
         <ls_tag>-sha1 = <ls_tag>-sha1(7).
 
       ENDLOOP.
diff --git a/src/zabapgit_services_git.prog.abap b/src/zabapgit_services_git.prog.abap
index ed4e3be90..d0956346a 100644
--- a/src/zabapgit_services_git.prog.abap
+++ b/src/zabapgit_services_git.prog.abap
@@ -256,7 +256,7 @@ CLASS lcl_services_git IMPLEMENTATION.
         zcx_abapgit_exception=>raise( |Cannot create tag { lv_name }. Error: '{ lx_error->text }'| ).
     ENDTRY.
 
-    lv_text = |Tag { lcl_tag=>remove_tag_prefix( lv_name ) } created| ##NO_TEXT.
+    lv_text = |Tag { zcl_abapgit_tag=>remove_tag_prefix( lv_name ) } created| ##NO_TEXT.
 
     MESSAGE lv_text TYPE 'S'.
 
@@ -279,7 +279,7 @@ CLASS lcl_services_git IMPLEMENTATION.
       io_repo = lo_repo
       is_tag  = ls_tag ).
 
-    lv_text = |Tag { lcl_tag=>remove_tag_prefix( ls_tag-name ) } deleted| ##NO_TEXT.
+    lv_text = |Tag { zcl_abapgit_tag=>remove_tag_prefix( ls_tag-name ) } deleted| ##NO_TEXT.
 
     MESSAGE lv_text TYPE 'S'.
 
diff --git a/src/zabapgit_tag.prog.abap b/src/zabapgit_tag.prog.abap
index 20ced58bf..ad2bd946e 100644
--- a/src/zabapgit_tag.prog.abap
+++ b/src/zabapgit_tag.prog.abap
@@ -1,41 +1,3 @@
 *&---------------------------------------------------------------------*
 *& Include zabapgit_tag
 *&---------------------------------------------------------------------*
-
-CLASS lcl_tag DEFINITION.
-
-  PUBLIC SECTION.
-    CLASS-METHODS:
-      add_tag_prefix
-        IMPORTING
-          iv_text        TYPE csequence
-        RETURNING
-          VALUE(rv_text) TYPE string,
-
-      remove_tag_prefix
-        IMPORTING
-          iv_text        TYPE string
-        RETURNING
-          VALUE(rv_text) TYPE string.
-
-ENDCLASS.
-
-CLASS lcl_tag IMPLEMENTATION.
-
-  METHOD add_tag_prefix.
-
-    rv_text = zif_abapgit_definitions=>gc_tag_prefix && iv_text.
-
-  ENDMETHOD.
-
-  METHOD remove_tag_prefix.
-
-    rv_text = iv_text.
-
-    REPLACE FIRST OCCURRENCE OF zif_abapgit_definitions=>gc_tag_prefix
-            IN rv_text
-            WITH ''.
-
-  ENDMETHOD.
-
-ENDCLASS.