diff --git a/src/com/android/telecomm/ConnectionServiceRepository.java b/src/com/android/telecomm/ConnectionServiceRepository.java
index 48b0ebb..cb8d95d 100644
--- a/src/com/android/telecomm/ConnectionServiceRepository.java
+++ b/src/com/android/telecomm/ConnectionServiceRepository.java
@@ -21,7 +21,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
-import android.telecomm.TelecommManager;
+import android.telecomm.ConnectionService;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -40,7 +40,7 @@
 
     Collection<ConnectionServiceWrapper> lookupServices() {
         PackageManager packageManager = TelecommApp.getInstance().getPackageManager();
-        Intent intent = new Intent(TelecommManager.ACTION_CONNECTION_SERVICE);
+        Intent intent = new Intent(ConnectionService.SERVICE_INTERFACE);
         ArrayList<ConnectionServiceWrapper> services = new ArrayList<>();
 
         for (ResolveInfo entry : packageManager.queryIntentServices(intent, 0)) {
diff --git a/src/com/android/telecomm/ConnectionServiceWrapper.java b/src/com/android/telecomm/ConnectionServiceWrapper.java
index 09ddeb0..0dbe1b7 100644
--- a/src/com/android/telecomm/ConnectionServiceWrapper.java
+++ b/src/com/android/telecomm/ConnectionServiceWrapper.java
@@ -25,22 +25,19 @@
 import android.os.Message;
 import android.os.RemoteException;
 import android.telecomm.CallAudioState;
-import android.telecomm.ConnectionService;
 import android.telecomm.ConnectionRequest;
+import android.telecomm.ConnectionService;
 import android.telecomm.GatewayInfo;
 import android.telecomm.StatusHints;
-import android.telecomm.TelecommManager;
 import android.telephony.DisconnectCause;
 
 import com.android.internal.os.SomeArgs;
+import com.android.internal.telecomm.ICallVideoProvider;
 import com.android.internal.telecomm.IConnectionService;
 import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.ICallVideoProvider;
 import com.android.internal.telecomm.RemoteServiceCallback;
 import com.google.common.base.Preconditions;
 
-import org.apache.http.conn.ClientConnectionRequest;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -532,7 +529,7 @@
      */
     ConnectionServiceWrapper(
             ComponentName componentName, ConnectionServiceRepository connectionServiceRepository) {
-        super(TelecommManager.ACTION_CONNECTION_SERVICE, componentName);
+        super(ConnectionService.SERVICE_INTERFACE, componentName);
         mConnectionServiceRepository = connectionServiceRepository;
     }