diff --git a/src/zabapgit_http.prog.abap b/src/zabapgit_http.prog.abap
index 19fd742c2..27c9bb0cf 100644
--- a/src/zabapgit_http.prog.abap
+++ b/src/zabapgit_http.prog.abap
@@ -170,7 +170,7 @@ CLASS lcl_http_client IMPLEMENTATION.
         name  = '~request_method'
         value = 'POST' ).
 
-    lv_value = lcl_url=>path_name( iv_url ) &&
+    lv_value = zcl_abapgit_url=>path_name( iv_url ) &&
       '/git-' &&
       iv_service &&
       '-pack'.
@@ -426,7 +426,7 @@ CLASS lcl_http IMPLEMENTATION.
 
     cl_http_client=>create_by_url(
       EXPORTING
-        url           = lcl_url=>host( iv_url )
+        url           = zcl_abapgit_url=>host( iv_url )
         ssl_id        = 'ANONYM'
         proxy_host    = lo_proxy_configuration->get_proxy_url( iv_url )
         proxy_service = lo_proxy_configuration->get_proxy_port( iv_url )
@@ -469,7 +469,7 @@ CLASS lcl_http IMPLEMENTATION.
     li_client->request->set_header_field(
         name  = 'user-agent'
         value = get_agent( ) ).                             "#EC NOTEXT
-    lv_uri = lcl_url=>path_name( iv_url ) &&
+    lv_uri = zcl_abapgit_url=>path_name( iv_url ) &&
              '/info/refs?service=git-' &&
              iv_service &&
              '-pack'.
diff --git a/src/zabapgit_page_db.prog.abap b/src/zabapgit_page_db.prog.abap
index 01ff72623..a30a12672 100644
--- a/src/zabapgit_page_db.prog.abap
+++ b/src/zabapgit_page_db.prog.abap
@@ -249,7 +249,7 @@ CLASS lcl_gui_page_db IMPLEMENTATION.
           IN is_data-data_str IGNORING CASE MATCH COUNT lv_cnt.
         IF lv_cnt > 0.
           rv_text = |<strong>On-line</strong>, Name: <strong>{
-                    lcl_url=>name( rv_text ) }</strong>|.
+                    zcl_abapgit_url=>name( rv_text ) }</strong>|.
         ELSE.
           rv_text = |Off-line, Name: <strong>{ rv_text }</strong>|.
         ENDIF.
diff --git a/src/zabapgit_popups.prog.abap b/src/zabapgit_popups.prog.abap
index bbf757d3b..614359298 100644
--- a/src/zabapgit_popups.prog.abap
+++ b/src/zabapgit_popups.prog.abap
@@ -597,7 +597,7 @@ CLASS lcl_popups IMPLEMENTATION.
       lv_finished = abap_true.
 
       TRY.
-          lcl_url=>name( |{ lv_url }| ).
+          zcl_abapgit_url=>name( |{ lv_url }| ).
           IF iv_freeze_package = abap_false.
             lcl_app=>repo_srv( )->validate_package( lv_package ).
           ENDIF.
diff --git a/src/zabapgit_repo_impl.prog.abap b/src/zabapgit_repo_impl.prog.abap
index 2a766eda3..9133e2189 100644
--- a/src/zabapgit_repo_impl.prog.abap
+++ b/src/zabapgit_repo_impl.prog.abap
@@ -740,7 +740,7 @@ CLASS lcl_repo IMPLEMENTATION.
     IF ms_data-offline = abap_true.
       rv_name = ms_data-url.
     ELSE.
-      rv_name = lcl_url=>name( ms_data-url ).
+      rv_name = zcl_abapgit_url=>name( ms_data-url ).
       rv_name = cl_http_utility=>if_http_utility~unescape_url( rv_name ).
     ENDIF.
 
@@ -1028,7 +1028,7 @@ CLASS lcl_repo_srv IMPLEMENTATION.
 
     IF iv_offline = abap_true. " On-line -> OFFline
       lo_repo->set(
-        iv_url         = lcl_url=>name( lo_repo->ms_data-url )
+        iv_url         = zcl_abapgit_url=>name( lo_repo->ms_data-url )
         iv_branch_name = ''
         iv_sha1        = ''
         iv_head_branch = ''
diff --git a/src/zabapgit_unit_test.prog.abap b/src/zabapgit_unit_test.prog.abap
index 36639fe32..c9e578f79 100644
--- a/src/zabapgit_unit_test.prog.abap
+++ b/src/zabapgit_unit_test.prog.abap
@@ -814,7 +814,7 @@ CLASS ltcl_url IMPLEMENTATION.
   METHOD repo_error.
 
     TRY.
-        lcl_url=>host( 'not a real url' ).                  "#EC NOTEXT
+        zcl_abapgit_url=>host( 'not a real url' ).                  "#EC NOTEXT
         cl_abap_unit_assert=>fail( ).
       CATCH zcx_abapgit_exception.                      "#EC NO_HANDLER
     ENDTRY.
@@ -825,7 +825,7 @@ CLASS ltcl_url IMPLEMENTATION.
 
     DATA: lv_host TYPE string.
 
-    lv_host = lcl_url=>host( 'https://github.com/larshp/Foobar.git' ).
+    lv_host = zcl_abapgit_url=>host( 'https://github.com/larshp/Foobar.git' ).
 
     cl_abap_unit_assert=>assert_equals(
         exp = 'https://github.com'
@@ -837,7 +837,7 @@ CLASS ltcl_url IMPLEMENTATION.
 
     DATA: lv_name TYPE string.
 
-    lv_name = lcl_url=>name( 'https://github.com/larshp/Foobar.git' ).
+    lv_name = zcl_abapgit_url=>name( 'https://github.com/larshp/Foobar.git' ).
 
     cl_abap_unit_assert=>assert_equals(
         exp = 'Foobar'
@@ -849,7 +849,7 @@ CLASS ltcl_url IMPLEMENTATION.
 
     DATA: lv_name TYPE string.
 
-    lv_name = lcl_url=>name( 'https://git.hanatrial.ondemand.com/p12345trial/yay' ).
+    lv_name = zcl_abapgit_url=>name( 'https://git.hanatrial.ondemand.com/p12345trial/yay' ).
 
     cl_abap_unit_assert=>assert_equals(
         exp = 'yay'
diff --git a/src/zabapgit_util.prog.abap b/src/zabapgit_util.prog.abap
index 409bcf53d..54a8b7cf8 100644
--- a/src/zabapgit_util.prog.abap
+++ b/src/zabapgit_util.prog.abap
@@ -492,11 +492,11 @@ CLASS lcl_path IMPLEMENTATION.
 ENDCLASS. "lcl_path
 
 *----------------------------------------------------------------------*
-*       CLASS lcl_url DEFINITION
+*       CLASS zcl_abapgit_url DEFINITION
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS lcl_url DEFINITION FINAL.
+CLASS zcl_abapgit_url DEFINITION FINAL.
 
   PUBLIC SECTION.
     CLASS-METHODS host
@@ -525,11 +525,11 @@ CLASS lcl_url DEFINITION FINAL.
 ENDCLASS.                    "lcl_repo DEFINITION
 
 *----------------------------------------------------------------------*
-*       CLASS lcl_url IMPLEMENTATION
+*       CLASS zcl_abapgit_url IMPLEMENTATION
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS lcl_url IMPLEMENTATION.
+CLASS zcl_abapgit_url IMPLEMENTATION.
 
   METHOD host.
     regex( EXPORTING iv_repo = iv_repo
@@ -975,7 +975,7 @@ CLASS lcl_login_manager IMPLEMENTATION.
     DATA: ls_auth LIKE LINE OF gt_auth.
 
 
-    READ TABLE gt_auth INTO ls_auth WITH KEY uri = lcl_url=>host( iv_uri ).
+    READ TABLE gt_auth INTO ls_auth WITH KEY uri = zcl_abapgit_url=>host( iv_uri ).
     IF sy-subrc = 0.
       rv_authorization = ls_auth-authorization.
 
@@ -1008,11 +1008,11 @@ CLASS lcl_login_manager IMPLEMENTATION.
     FIELD-SYMBOLS: <ls_auth> LIKE LINE OF gt_auth.
 
 
-    READ TABLE gt_auth WITH KEY uri = lcl_url=>host( iv_uri )
+    READ TABLE gt_auth WITH KEY uri = zcl_abapgit_url=>host( iv_uri )
       TRANSPORTING NO FIELDS.
     IF sy-subrc <> 0.
       APPEND INITIAL LINE TO gt_auth ASSIGNING <ls_auth>.
-      <ls_auth>-uri           = lcl_url=>host( iv_uri ).
+      <ls_auth>-uri           = zcl_abapgit_url=>host( iv_uri ).
       <ls_auth>-authorization = iv_auth.
     ENDIF.