diff --git a/nearby/service/java/com/android/server/nearby/NearbyServiceImpl.java b/nearby/service/java/com/android/server/nearby/NearbyService.java
similarity index 97%
rename from nearby/service/java/com/android/server/nearby/NearbyServiceImpl.java
rename to nearby/service/java/com/android/server/nearby/NearbyService.java
index 17261b0..5326673 100644
--- a/nearby/service/java/com/android/server/nearby/NearbyServiceImpl.java
+++ b/nearby/service/java/com/android/server/nearby/NearbyService.java
@@ -40,7 +40,7 @@
 /**
  * Service implementing nearby functionality.
  */
-public class NearbyServiceImpl extends INearbyManager.Stub {
+public class NearbyService extends INearbyManager.Stub {
     public static final String TAG = "NearbyService";
 
     private final Context mContext;
@@ -63,7 +63,7 @@
     };
     private DiscoveryProviderManager mProviderManager;
 
-    public NearbyServiceImpl(Context context) {
+    public NearbyService(Context context) {
         mContext = context;
         mSystemInjector = new SystemInjector(context);
         mProviderManager = new DiscoveryProviderManager(context, mSystemInjector);