diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index 1cfed0d..54dbb2e 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -69,14 +69,6 @@ on property:ro.boot.hardware.revision=PROTO1.0
 on property:ro.boot.hardware.revision=PROTO1.1
     setprop vendor.thermal.config "thermal_info_config_proto.json"
 
-# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints
-on property:sys.boot_completed=1
-    trigger override-sf-uclamp
-
-on override-sf-uclamp
-    write /proc/vendor_sched/rt_uclamp_min 0
-    write /proc/vendor_sched/sf_uclamp_min 0
-
 # Haptics
 on property:vendor.all.modules.ready=1
     mkdir /mnt/vendor/persist/haptics 0770 system system
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 9d0c4a1..d3b7c69 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -310,7 +310,8 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.gms.dck.eligible_wcc=3
+    ro.gms.dck.eligible_wcc=3 \
+    ro.gms.dck.se_capability=1
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-panther.mk b/device-panther.mk
index c75c837..5e3e1fa 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -295,7 +295,9 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.gms.dck.eligible_wcc=2
+    ro.gms.dck.eligible_wcc=2 \
+    ro.gms.dck.se_capability=1
+
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/self-extractors_cheetah/extract-lists.txt b/self-extractors_cheetah/extract-lists.txt
index 255e82e..9fc0800 100644
--- a/self-extractors_cheetah/extract-lists.txt
+++ b/self-extractors_cheetah/extract-lists.txt
@@ -11,7 +11,7 @@
             system_ext/lib64/libmediaadaptor.so \
             system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
             system_ext/priv-app/ShannonIms/ShannonIms.apk \
-            system_ext/priv-app/QualifiedNetworksService/QualifiedNetworksService.apk \
+            system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
             system_ext/priv-app/UwbVendorService/UwbVendorService.apk \
             "
     ;;
diff --git a/self-extractors_cheetah/google_devices/staging/Android.mk b/self-extractors_cheetah/google_devices/staging/Android.mk
index 6e1e67e..8982deb 100644
--- a/self-extractors_cheetah/google_devices/staging/Android.mk
+++ b/self-extractors_cheetah/google_devices/staging/Android.mk
@@ -24,7 +24,7 @@ endif
 ifneq ($(filter cheetah,$(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := QualifiedNetworksService
+LOCAL_MODULE := PixelQualifiedNetworksService
 LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_SYSTEM_EXT_MODULE := true
diff --git a/self-extractors_cheetah/google_devices/staging/device-partial.mk b/self-extractors_cheetah/google_devices/staging/device-partial.mk
index c7a502d..45a4692 100644
--- a/self-extractors_cheetah/google_devices/staging/device-partial.mk
+++ b/self-extractors_cheetah/google_devices/staging/device-partial.mk
@@ -17,7 +17,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    QualifiedNetworksService \
+    PixelQualifiedNetworksService \
     ShannonIms \
     ShannonRcs \
     UwbVendorService \
diff --git a/self-extractors_panther/extract-lists.txt b/self-extractors_panther/extract-lists.txt
index e09731b..63655a4 100644
--- a/self-extractors_panther/extract-lists.txt
+++ b/self-extractors_panther/extract-lists.txt
@@ -10,7 +10,7 @@
             system_ext/lib64/libmediaadaptor.so \
             system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
             system_ext/priv-app/ShannonIms/ShannonIms.apk \
-            system_ext/priv-app/QualifiedNetworksService/QualifiedNetworksService.apk \
+            system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
             "
     ;;
 
diff --git a/self-extractors_panther/google_devices/staging/Android.mk b/self-extractors_panther/google_devices/staging/Android.mk
index 21f8297..763f1fb 100644
--- a/self-extractors_panther/google_devices/staging/Android.mk
+++ b/self-extractors_panther/google_devices/staging/Android.mk
@@ -24,7 +24,7 @@ endif
 ifneq ($(filter panther,$(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := QualifiedNetworksService
+LOCAL_MODULE := PixelQualifiedNetworksService
 LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_SYSTEM_EXT_MODULE := true
diff --git a/self-extractors_panther/google_devices/staging/device-partial.mk b/self-extractors_panther/google_devices/staging/device-partial.mk
index 72b15e6..38d2027 100644
--- a/self-extractors_panther/google_devices/staging/device-partial.mk
+++ b/self-extractors_panther/google_devices/staging/device-partial.mk
@@ -17,7 +17,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    QualifiedNetworksService \
+    PixelQualifiedNetworksService \
     ShannonIms \
     ShannonRcs \