diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 51b547d..34a4583 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -426,7 +426,7 @@
                  android:resource="@xml/authenticator"/>
         </service>
         <service
-            android:name=".hfp.BluetoothInCallService"
+            android:name=".telephony.BluetoothInCallService"
             android:permission="android.permission.BIND_INCALL_SERVICE"
             android:process="@string/process"
             android:enabled="@bool/profile_supported_hfp_incallservice"
diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java
index 570239b..811a03c 100644
--- a/src/com/android/bluetooth/btservice/AdapterState.java
+++ b/src/com/android/bluetooth/btservice/AdapterState.java
@@ -23,7 +23,7 @@
 import android.util.Log;
 
 import com.android.bluetooth.R;
-import com.android.bluetooth.hfp.BluetoothInCallService;
+import com.android.bluetooth.telephony.BluetoothInCallService;
 import com.android.bluetooth.statemachine.State;
 import com.android.bluetooth.statemachine.StateMachine;
 
diff --git a/src/com/android/bluetooth/hfp/HeadsetSystemInterface.java b/src/com/android/bluetooth/hfp/HeadsetSystemInterface.java
index a618019..df30a3f 100644
--- a/src/com/android/bluetooth/hfp/HeadsetSystemInterface.java
+++ b/src/com/android/bluetooth/hfp/HeadsetSystemInterface.java
@@ -20,6 +20,7 @@
 import android.annotation.Nullable;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
+import com.android.bluetooth.telephony.BluetoothInCallService;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/src/com/android/bluetooth/telephony/BluetoothCall.java b/src/com/android/bluetooth/telephony/BluetoothCall.java
index 81c3fc1..85a0b9a 100644
--- a/src/com/android/bluetooth/telephony/BluetoothCall.java
+++ b/src/com/android/bluetooth/telephony/BluetoothCall.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.bluetooth.hfp;
+package com.android.bluetooth.telephony;
 
 import android.net.Uri;
 import android.os.Bundle;
diff --git a/src/com/android/bluetooth/telephony/BluetoothInCallService.java b/src/com/android/bluetooth/telephony/BluetoothInCallService.java
index 7444ffc..bcd7079 100644
--- a/src/com/android/bluetooth/telephony/BluetoothInCallService.java
+++ b/src/com/android/bluetooth/telephony/BluetoothInCallService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.bluetooth.hfp;
+package com.android.bluetooth.telephony;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothHeadset;
@@ -41,6 +41,8 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.bluetooth.hfp.BluetoothHeadsetProxy;
+
 import androidx.annotation.VisibleForTesting;
 
 import java.util.ArrayList;
diff --git a/tests/unit/src/com/android/bluetooth/telephony/BluetoothInCallServiceTest.java b/tests/unit/src/com/android/bluetooth/telephony/BluetoothInCallServiceTest.java
index d3db9c6..878ad8b 100644
--- a/tests/unit/src/com/android/bluetooth/telephony/BluetoothInCallServiceTest.java
+++ b/tests/unit/src/com/android/bluetooth/telephony/BluetoothInCallServiceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.bluetooth.hfp;
+package com.android.bluetooth.telephony;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -51,6 +51,8 @@
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.bluetooth.hfp.BluetoothHeadsetProxy;
+
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -1178,7 +1180,7 @@
     }
 
     private BluetoothCall getMockCall() {
-        BluetoothCall call = mock(com.android.bluetooth.hfp.BluetoothCall.class);
+        BluetoothCall call = mock(com.android.bluetooth.telephony.BluetoothCall.class);
         String uuid = UUID.randomUUID().toString();
         when(call.getTelecomCallId()).thenReturn(uuid);
         return call;