diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index 1c09728..14973e1 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -427,7 +427,7 @@
     @Override
     protected void onDestroy() {
         getSystemService(AccessibilityManager.class).removeAccessibilityStateChangeListener(this);
-        VmLauncherService.stopVmLauncherService(this);
+        VmLauncherService.stop(this);
         super.onDestroy();
     }
 
@@ -580,7 +580,7 @@
                         .build();
 
         android.os.Trace.beginAsyncSection("executeTerminal", 0);
-        VmLauncherService.startVmLauncherService(this, this, notification);
+        VmLauncherService.run(this, this, notification);
         connectToTerminalService();
     }
 
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
index 2f7a308..cd1f65b 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
@@ -98,7 +98,7 @@
         void onIpAddrAvailable(String ipAddr);
     }
 
-    public static void startVmLauncherService(
+    public static void run(
             Context context, VmLauncherServiceCallback callback, Notification notification) {
         Intent i = getMyIntent(context);
         if (i == null) {
@@ -273,7 +273,7 @@
         mResultReceiver.send(VmLauncherService.RESULT_IPADDR, b);
     }
 
-    public static void stopVmLauncherService(Context context) {
+    public static void stop(Context context) {
         Intent i = getMyIntent(context);
         context.stopService(i);
     }
