diff --git a/api/Android.bp b/api/Android.bp
index 318748e20808b..f49e6dd079251 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -100,7 +100,7 @@ combined_apis {
         "framework-connectivity-t",
         "framework-devicelock",
         "framework-graphics",
-        "framework-healthconnect",
+        "framework-healthfitness",
         "framework-media",
         "framework-mediaprovider",
         "framework-ondevicepersonalization",
@@ -119,7 +119,7 @@ combined_apis {
     system_server_classpath: [
         "service-art",
         "service-configinfrastructure",
-        "service-healthconnect",
+        "service-healthfitness",
         "service-media-s",
         "service-permission",
         "service-rkp",
diff --git a/boot/Android.bp b/boot/Android.bp
index d4a65001b0d50..83a46c5223175 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -88,8 +88,8 @@ custom_platform_bootclasspath {
             module: "com.android.devicelock-bootclasspath-fragment",
         },
         {
-            apex: "com.android.healthconnect",
-            module: "com.android.healthconnect-bootclasspath-fragment",
+            apex: "com.android.healthfitness",
+            module: "com.android.healthfitness-bootclasspath-fragment",
         },
         {
             apex: "com.android.i18n",
diff --git a/packages/SettingsLib/ActivityEmbedding/Android.bp b/packages/SettingsLib/ActivityEmbedding/Android.bp
index 4b4cfb7f38dcf..0cd9fe387a22f 100644
--- a/packages/SettingsLib/ActivityEmbedding/Android.bp
+++ b/packages/SettingsLib/ActivityEmbedding/Android.bp
@@ -30,6 +30,6 @@ android_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.permission",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/AppPreference/Android.bp b/packages/SettingsLib/AppPreference/Android.bp
index af7b8b4ccfc0e..0ba47a8156e36 100644
--- a/packages/SettingsLib/AppPreference/Android.bp
+++ b/packages/SettingsLib/AppPreference/Android.bp
@@ -23,6 +23,6 @@ android_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.permission",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp b/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
index 50f8e5466783e..6330848f63166 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
@@ -28,6 +28,6 @@ android_library {
         "com.android.adservices",
         "com.android.cellbroadcast",
         "com.android.permission",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/FooterPreference/Android.bp b/packages/SettingsLib/FooterPreference/Android.bp
index bcedf50a873f2..8b976bbb2c56c 100644
--- a/packages/SettingsLib/FooterPreference/Android.bp
+++ b/packages/SettingsLib/FooterPreference/Android.bp
@@ -23,6 +23,6 @@ android_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.permission",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/HelpUtils/Android.bp b/packages/SettingsLib/HelpUtils/Android.bp
index 3ec4366aed235..13fcf8c7cbe36 100644
--- a/packages/SettingsLib/HelpUtils/Android.bp
+++ b/packages/SettingsLib/HelpUtils/Android.bp
@@ -22,6 +22,6 @@ android_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.permission",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/MainSwitchPreference/Android.bp b/packages/SettingsLib/MainSwitchPreference/Android.bp
index 372a276a8967f..825e6acdf1f99 100644
--- a/packages/SettingsLib/MainSwitchPreference/Android.bp
+++ b/packages/SettingsLib/MainSwitchPreference/Android.bp
@@ -25,6 +25,6 @@ android_library {
         "//apex_available:platform",
         "com.android.adservices",
         "com.android.cellbroadcast",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/SettingsTheme/Android.bp b/packages/SettingsLib/SettingsTheme/Android.bp
index 939977fa7ef2a..09691f19e9cea 100644
--- a/packages/SettingsLib/SettingsTheme/Android.bp
+++ b/packages/SettingsLib/SettingsTheme/Android.bp
@@ -23,7 +23,7 @@ android_library {
         "com.android.cellbroadcast",
         "com.android.permission",
         "com.android.adservices",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
         "com.android.mediaprovider",
     ],
 }
diff --git a/packages/SettingsLib/SettingsTransition/Android.bp b/packages/SettingsLib/SettingsTransition/Android.bp
index be77845992cf4..7f9014cecc69c 100644
--- a/packages/SettingsLib/SettingsTransition/Android.bp
+++ b/packages/SettingsLib/SettingsTransition/Android.bp
@@ -23,6 +23,6 @@ android_library {
         "com.android.adservices",
         "com.android.cellbroadcast",
         "com.android.permission",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/TopIntroPreference/Android.bp b/packages/SettingsLib/TopIntroPreference/Android.bp
index 9e865679069c6..eca116586fbe9 100644
--- a/packages/SettingsLib/TopIntroPreference/Android.bp
+++ b/packages/SettingsLib/TopIntroPreference/Android.bp
@@ -23,6 +23,6 @@ android_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.cellbroadcast",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/TwoTargetPreference/Android.bp b/packages/SettingsLib/TwoTargetPreference/Android.bp
index e9c6aed53d0fb..a3e50a92c0af3 100644
--- a/packages/SettingsLib/TwoTargetPreference/Android.bp
+++ b/packages/SettingsLib/TwoTargetPreference/Android.bp
@@ -23,6 +23,6 @@ android_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.permission",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }
diff --git a/packages/SettingsLib/Utils/Android.bp b/packages/SettingsLib/Utils/Android.bp
index dc88304e1d3c2..644e990bf9d9e 100644
--- a/packages/SettingsLib/Utils/Android.bp
+++ b/packages/SettingsLib/Utils/Android.bp
@@ -26,6 +26,6 @@ android_library {
         "com.android.adservices",
         "com.android.permission",
         "com.android.cellbroadcast",
-        "com.android.healthconnect",
+        "com.android.healthfitness",
     ],
 }