diff --git a/src/local_ops.py b/src/local_ops.py
index e1088fa..e1adf30 100644
--- a/src/local_ops.py
+++ b/src/local_ops.py
@@ -740,7 +740,7 @@ def is_abs_path(self, path: str) -> bool:
         assert type(path) is str
         return os.path.isabs(path)
 
-    def get_basename(self, path: str) -> str:
+    def get_path_basename(self, path: str) -> str:
         assert type(path) is str
         return os.path.basename(path)
 
diff --git a/src/os_ops.py b/src/os_ops.py
index f25ec85..f683e6a 100644
--- a/src/os_ops.py
+++ b/src/os_ops.py
@@ -296,7 +296,7 @@ def is_abs_path(self, path: str) -> bool:
         assert type(path) is str
         raise NotImplementedError()
 
-    def get_basename(self, path: str) -> str:
+    def get_path_basename(self, path: str) -> str:
         assert type(path) is str
         raise NotImplementedError()
 
diff --git a/src/remote_ops.py b/src/remote_ops.py
index 6aaaeef..27a3ca6 100644
--- a/src/remote_ops.py
+++ b/src/remote_ops.py
@@ -1021,9 +1021,9 @@ def is_abs_path(self, path: str) -> bool:
         assert type(path) is str
         return __class__._is_abs_path(path)
 
-    def get_basename(self, path: str) -> str:
+    def get_path_basename(self, path: str) -> str:
         assert type(path) is str
-        return __class__._get_basename(path)
+        return __class__._get_path_basename(path)
 
     def get_abs_path(self, path: str) -> str:
         assert type(path) is str
@@ -1151,7 +1151,7 @@ def _is_abs_path(path: str) -> bool:
         return posixpath.isabs(path)
 
     @staticmethod
-    def _get_basename(path: str) -> str:
+    def _get_path_basename(path: str) -> str:
         assert type(path) is str
         return posixpath.basename(path)
 
diff --git a/tests/test_os_ops_common.py b/tests/test_os_ops_common.py
index 391db18..520b405 100644
--- a/tests/test_os_ops_common.py
+++ b/tests/test_os_ops_common.py
@@ -1999,11 +1999,11 @@ def LOCAL__check(value, expected) -> bool:
         dir = os_ops.mkdtemp()
         LOCAL__check(dir, dir)
 
-        dirname = os_ops.get_basename(dir)
+        dirname = os_ops.get_path_basename(dir)
         path = os_ops.build_path(dir, "..", dirname)
         LOCAL__check(path, dir)
 
-        dirname = os_ops.get_basename(dir)
+        dirname = os_ops.get_path_basename(dir)
         path = os_ops.build_path(dir, "..", dirname, "abc.txt")
         expected_r = os_ops.build_path(dir, "abc.txt")
         LOCAL__check(path, expected_r)
@@ -2067,58 +2067,58 @@ def LOCAL__check(value, expected) -> bool:
 
     # --------------------------------------------------------------------
     @dataclasses.dataclass
-    class tagGetBaseNameData:
+    class tagGetPathBaseNameData:
         sign: str
         value: str
         result: str
 
-    sm_GetBaseNameDatas: typing.List[tagGetBaseNameData] = [
-        tagGetBaseNameData(
+    sm_GetPathBaseNameDatas: typing.List[tagGetPathBaseNameData] = [
+        tagGetPathBaseNameData(
             sign="empty",
             value="",
             result="",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="relative_curdir",
             value=".",
             result=".",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="relative_parentdir",
             value="..",
             result="..",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="a",
             value="a",
             result="a",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="a.txt",
             value="a.txt",
             result="a.txt",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="root__a.txt",
             value="/a.txt",
             result="a.txt",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="curdir__a.txt",
             value="./a.txt",
             result="a.txt",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="parentdir__a.txt",
             value="../a.txt",
             result="a.txt",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="path001",
             value="a/b/c/my-file-name.txt",
             result="my-file-name.txt",
         ),
-        tagGetBaseNameData(
+        tagGetPathBaseNameData(
             sign="path002",
             value="a/b/c/my-file-name",
             result="my-file-name",
@@ -2131,32 +2131,32 @@ class tagGetBaseNameData:
                 x,
                 id=x.sign,
             )
-            for x in sm_GetBaseNameDatas
+            for x in sm_GetPathBaseNameDatas
         ]
     )
-    def fx_get_basename_data(
+    def fx_get_path_basename_data(
         self,
         request: pytest.FixtureRequest,
-    ) -> tagGetBaseNameData:
+    ) -> tagGetPathBaseNameData:
         assert isinstance(request, pytest.FixtureRequest)
-        assert type(request.param).__name__ == "tagGetBaseNameData"
+        assert type(request.param).__name__ == "tagGetPathBaseNameData"
         return request.param
 
-    def test_get_basename(
+    def test_get_path_basename(
         self,
         os_ops_descr: OsOpsDescr,
-        fx_get_basename_data: tagGetBaseNameData,
+        fx_get_path_basename_data: tagGetPathBaseNameData,
     ):
         assert type(os_ops_descr) is OsOpsDescr
         assert isinstance(os_ops_descr.os_ops, OsOperations)
-        assert type(fx_get_basename_data) is __class__.tagGetBaseNameData
+        assert type(fx_get_path_basename_data) is __class__.tagGetPathBaseNameData
 
         os_ops = os_ops_descr.os_ops
         assert isinstance(os_ops, OsOperations)
 
-        actual_value = os_ops.get_basename(fx_get_basename_data.value)
+        actual_value = os_ops.get_path_basename(fx_get_path_basename_data.value)
         assert type(actual_value) is str
-        assert actual_value == fx_get_basename_data.result
+        assert actual_value == fx_get_path_basename_data.result
         return
 
     # --------------------------------------------------------------------