diff --git a/InCallUI/AndroidManifest.xml b/InCallUI/AndroidManifest.xml
index 24d5481..78bc0fb 100644
--- a/InCallUI/AndroidManifest.xml
+++ b/InCallUI/AndroidManifest.xml
@@ -40,9 +40,9 @@
                   android:exported="false">
         </activity>
 
-        <service android:name="CallMonitorService">
+        <service android:name="CallHandlerService">
             <intent-filter>
-                <action android:name="com.android.services.telephony.common.ICallMonitorService" />
+                <action android:name="com.android.services.telephony.common.ICallHandlerService" />
             </intent-filter>
         </service>
 
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index 8d06c89..1d0f395 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -33,7 +33,7 @@
 
     public void onAnswer() {
         // TODO(klp): hook in call id.
-        CallMonitorService.answerCall(1);
+        CallHandlerService.answerCall(1);
         mListener.onAnswered();
     }
 
diff --git a/InCallUI/src/com/android/incallui/CallMonitorService.java b/InCallUI/src/com/android/incallui/CallHandlerService.java
similarity index 89%
rename from InCallUI/src/com/android/incallui/CallMonitorService.java
rename to InCallUI/src/com/android/incallui/CallHandlerService.java
index 1af2c7b..741701c 100644
--- a/InCallUI/src/com/android/incallui/CallMonitorService.java
+++ b/InCallUI/src/com/android/incallui/CallHandlerService.java
@@ -24,14 +24,14 @@
 
 import com.android.internal.util.Preconditions;
 import com.android.services.telephony.common.ICallCommandService;
-import com.android.services.telephony.common.ICallMonitorService;
+import com.android.services.telephony.common.ICallHandlerService;
 
 /**
  * Service used to listen for call state changes.
  */
-public class CallMonitorService extends Service {
+public class CallHandlerService extends Service {
 
-    private static final String TAG = CallMonitorService.class.getSimpleName();
+    private static final String TAG = CallHandlerService.class.getSimpleName();
     private static final boolean DBG = false; // TODO: Have a shared location for this.
 
     private static ICallCommandService mCallCommandService;
@@ -50,7 +50,7 @@
         return mBinder;
     }
 
-    private final ICallMonitorService.Stub mBinder = new ICallMonitorService.Stub() {
+    private final ICallHandlerService.Stub mBinder = new ICallHandlerService.Stub() {
 
         @Override
         public void setCallCommandService(ICallCommandService service) {