diff --git a/transport/Android.bp b/transport/Android.bp
index ab6619e..6518177 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -67,9 +67,9 @@
         "HidlBinderSupport.cpp",
         "HidlLazyUtils.cpp",
         "HidlPassthroughSupport.cpp",
-        "HidlServiceManagement.cpp",
         "HidlTransportSupport.cpp",
         "HidlTransportUtils.cpp",
+        "ServiceManagement.cpp",
         "Static.cpp"
     ],
 
diff --git a/transport/HidlServiceManagement.cpp b/transport/ServiceManagement.cpp
similarity index 100%
rename from transport/HidlServiceManagement.cpp
rename to transport/ServiceManagement.cpp