diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 73d5967..31b2f84 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -190,7 +190,7 @@
         <receiver android:name=".components.TelecomBroadcastReceiver" android:exported="false"
                 android:process="system">
             <intent-filter>
-                <action android:name="com.android.server.telecom.ACTION_CALL_BACK_FROM_NOTIFICATION" />
+                <action android:name="com.android.server.telecom.ACTION_CLEAR_MISSED_CALLS" />
                 <action android:name="com.android.server.telecom.ACTION_CALL_BACK_FROM_NOTIFICATION" />
                 <action android:name="com.android.server.telecom.ACTION_SEND_SMS_FROM_NOTIFICATION" />
             </intent-filter>
@@ -242,7 +242,7 @@
                 android:singleUser="true"
                 android:process="system">
             <intent-filter>
-                <android android:name="android.telecom.ITelecomService" />
+                <action android:name="android.telecom.ITelecomService" />
             </intent-filter>
         </service>
 
diff --git a/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java b/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
index bb1faed..d7e9759 100644
--- a/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
+++ b/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
@@ -26,6 +26,7 @@
 import com.android.server.telecom.R;
 import com.android.server.telecom.TelecomBroadcastIntentProcessor;
 import com.android.server.telecom.TelecomSystem;
+import com.android.server.telecom.components.TelecomBroadcastReceiver;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -106,6 +107,7 @@
     }
 
     /** Clears missed call notification and marks the call log's missed calls as read. */
+    @Override
     public void clearMissedCalls() {
         AsyncTask.execute(new Runnable() {
             @Override
@@ -131,6 +133,7 @@
      *
      * @param call The missed call.
      */
+    @Override
     public void showMissedCallNotification(Call call) {
         mMissedCallCount++;
 
@@ -290,7 +293,7 @@
      * @param data The intent data.
      */
     private PendingIntent createTelecomPendingIntent(String action, Uri data) {
-        Intent intent = new Intent(action, data, mContext, TelecomBroadcastIntentProcessor.class);
+        Intent intent = new Intent(action, data, mContext, TelecomBroadcastReceiver.class);
         return PendingIntent.getBroadcast(mContext, 0, intent, 0);
     }
 
