diff --git a/rebootescrow/aidl/Android.bp b/rebootescrow/aidl/Android.bp
index 7bc8d6f..0742939 100644
--- a/rebootescrow/aidl/Android.bp
+++ b/rebootescrow/aidl/Android.bp
@@ -1,5 +1,5 @@
 aidl_interface {
-    name: "vintf-rebootescrow",
+    name: "android.hardware.rebootescrow",
     vendor_available: true,
     srcs: [
         "android/hardware/rebootescrow/IRebootEscrow.aidl",
diff --git a/rebootescrow/aidl/default/Android.bp b/rebootescrow/aidl/default/Android.bp
index c8cbf48..b77272f 100644
--- a/rebootescrow/aidl/default/Android.bp
+++ b/rebootescrow/aidl/default/Android.bp
@@ -20,7 +20,7 @@
     shared_libs: [
         "libbase",
         "libbinder_ndk",
-        "vintf-rebootescrow-ndk_platform",
+        "android.hardware.rebootescrow-ndk_platform",
     ],
     export_include_dirs: ["include"],
     srcs: [
@@ -47,7 +47,7 @@
     shared_libs: [
         "libbase",
         "libbinder_ndk",
-        "vintf-rebootescrow-ndk_platform",
+        "android.hardware.rebootescrow-ndk_platform",
     ],
     static_libs: [
         "libhadamardutils",
diff --git a/rebootescrow/aidl/vts/functional/Android.bp b/rebootescrow/aidl/vts/functional/Android.bp
index dadf250..5d51a53 100644
--- a/rebootescrow/aidl/vts/functional/Android.bp
+++ b/rebootescrow/aidl/vts/functional/Android.bp
@@ -25,7 +25,7 @@
         "libbinder",
     ],
     static_libs: [
-        "vintf-rebootescrow-cpp",
+        "android.hardware.rebootescrow-cpp",
     ],
     test_suites: [
         "vts-core",