diff --git a/transport/Android.bp b/transport/Android.bp
index 50f277e..0e1be8f 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -80,9 +80,9 @@
         "HidlBinderSupport.cpp",
         "HidlLazyUtils.cpp",
         "HidlPassthroughSupport.cpp",
+        "HidlServiceManagement.cpp",
         "HidlTransportSupport.cpp",
         "HidlTransportUtils.cpp",
-        "ServiceManagement.cpp",
         "Static.cpp"
     ],
 
diff --git a/transport/ServiceManagement.cpp b/transport/HidlServiceManagement.cpp
similarity index 99%
rename from transport/ServiceManagement.cpp
rename to transport/HidlServiceManagement.cpp
index 374470e..357bb30 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/HidlServiceManagement.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "ServiceManagement"
+#define LOG_TAG "HidlServiceManagement"
 
 #include <android/dlext.h>
 #include <condition_variable>