diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp
index 6f2d292..f55e799 100644
--- a/common/aidl/Android.bp
+++ b/common/aidl/Android.bp
@@ -1,5 +1,5 @@
 aidl_interface {
-    name: "vintf-common",
+    name: "android.hardware.common",
     host_supported: true,
     vendor_available: true,
     vndk: {
diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp
index fcd4efc..601cabc 100644
--- a/graphics/common/aidl/Android.bp
+++ b/graphics/common/aidl/Android.bp
@@ -1,5 +1,5 @@
 aidl_interface {
-    name: "vintf-graphics-common",
+    name: "android.hardware.graphics.common",
     host_supported: true,
     vendor_available: true,
     vndk: {
@@ -11,7 +11,7 @@
     ],
     stability: "vintf",
     imports: [
-        "vintf-common"
+        "android.hardware.common",
     ],
     backend: {
         java: {
diff --git a/graphics/mapper/4.0/vts/functional/Android.bp b/graphics/mapper/4.0/vts/functional/Android.bp
index 926cf31..3542a6e 100644
--- a/graphics/mapper/4.0/vts/functional/Android.bp
+++ b/graphics/mapper/4.0/vts/functional/Android.bp
@@ -19,10 +19,10 @@
     defaults: ["VtsHalTargetTestDefaults"],
     srcs: ["VtsHalGraphicsMapperV4_0TargetTest.cpp"],
     static_libs: [
+        "android.hardware.graphics.common-ndk_platform",
         "android.hardware.graphics.mapper@4.0-vts",
         "libgralloctypes",
         "libsync",
-        "vintf-graphics-common-ndk_platform",
     ],
     shared_libs: [
         "android.hardware.graphics.allocator@4.0",
@@ -34,5 +34,8 @@
     header_libs: [
         "libsystem_headers",
     ],
-    test_suites: ["general-tests", "vts-core"],
+    test_suites: [
+        "general-tests",
+        "vts-core",
+    ],
 }