diff --git a/build/soong/service_fuzzer_bindings.go b/build/soong/service_fuzzer_bindings.go
index 0065c49..39ca452 100644
--- a/build/soong/service_fuzzer_bindings.go
+++ b/build/soong/service_fuzzer_bindings.go
@@ -159,19 +159,19 @@
 		"android.system.keystore2.IKeystoreService/default":                       EXCEPTION_NO_FUZZER,
 		"android.system.net.netd.INetd/default":                                   []string{"netd_hw_service_fuzzer"},
 		"android.system.suspend.ISystemSuspend/default":                           EXCEPTION_NO_FUZZER,
-		"accessibility":       EXCEPTION_NO_FUZZER,
-		"account":             EXCEPTION_NO_FUZZER,
-		"activity":            EXCEPTION_NO_FUZZER,
-		"activity_task":       EXCEPTION_NO_FUZZER,
-		"adaptive_auth":       EXCEPTION_NO_FUZZER,
-		"adb":                 EXCEPTION_NO_FUZZER,
-		"adservices_manager":  EXCEPTION_NO_FUZZER,
-		"advanced_protection": EXCEPTION_NO_FUZZER,
-		"aidl_lazy_test_1":    EXCEPTION_NO_FUZZER,
-		"aidl_lazy_test_2":    EXCEPTION_NO_FUZZER,
-		"aidl_lazy_test_quit": EXCEPTION_NO_FUZZER,
-		"aidl_lazy_cb_test":   EXCEPTION_NO_FUZZER,
-		"alarm":               EXCEPTION_NO_FUZZER,
+		"accessibility":           EXCEPTION_NO_FUZZER,
+		"account":                 EXCEPTION_NO_FUZZER,
+		"activity":                EXCEPTION_NO_FUZZER,
+		"activity_task":           EXCEPTION_NO_FUZZER,
+		"adaptive_authentication": EXCEPTION_NO_FUZZER,
+		"adb":                     EXCEPTION_NO_FUZZER,
+		"adservices_manager":      EXCEPTION_NO_FUZZER,
+		"advanced_protection":     EXCEPTION_NO_FUZZER,
+		"aidl_lazy_test_1":        EXCEPTION_NO_FUZZER,
+		"aidl_lazy_test_2":        EXCEPTION_NO_FUZZER,
+		"aidl_lazy_test_quit":     EXCEPTION_NO_FUZZER,
+		"aidl_lazy_cb_test":       EXCEPTION_NO_FUZZER,
+		"alarm":                   EXCEPTION_NO_FUZZER,
 		"android.hardware.automotive.evs.IEvsEnumerator/default":         EXCEPTION_NO_FUZZER,
 		"android.os.UpdateEngineService":                                 []string{"update_engine_service_fuzzer"},
 		"android.os.UpdateEngineStableService":                           []string{"update_engine_service_fuzzer"},
diff --git a/private/service.te b/private/service.te
index eee98d0..31b3d73 100644
--- a/private/service.te
+++ b/private/service.te
@@ -1,4 +1,4 @@
-type adaptive_auth_service,          system_server_service, service_manager_type;
+type adaptive_authentication_service, system_api_service, system_server_service, service_manager_type;
 type ambient_context_service,        app_api_service, system_server_service, service_manager_type;
 
 # These types will be public starting at board api 202504
diff --git a/private/service_contexts b/private/service_contexts
index 7c3c5de..1ec1566 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -144,7 +144,7 @@
 account                                   u:object_r:account_service:s0
 activity                                  u:object_r:activity_service:s0
 activity_task                             u:object_r:activity_task_service:s0
-adaptive_auth                             u:object_r:adaptive_auth_service:s0
+adaptive_authentication                   u:object_r:adaptive_authentication_service:s0
 adb                                       u:object_r:adb_service:s0
 adservices_manager                        u:object_r:adservices_manager_service:s0
 starting_at_board_api(202504, `