diff --git a/transport/Android.bp b/transport/Android.bp
index b0c40e2..77cfe27 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -74,8 +74,8 @@
         debuggable: {
             cflags: ["-DLIBHIDL_TARGET_DEBUGGABLE"],
         },
-        treble: {
-            cflags: ["-DLIBHIDL_TARGET_TREBLE"]
+        enforce_vintf_manifest: {
+            cflags: ["-DENFORCE_VINTF_MANIFEST"]
         },
     },
 }
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 357faaf..ef86f99 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -639,22 +639,22 @@
     const bool vintfHwbinder = (transport == Transport::HWBINDER);
     const bool vintfPassthru = (transport == Transport::PASSTHROUGH);
 
-#ifdef LIBHIDL_TARGET_TREBLE
+#ifdef ENFORCE_VINTF_MANIFEST
 
 #ifdef LIBHIDL_TARGET_DEBUGGABLE
     const char* env = std::getenv("TREBLE_TESTING_OVERRIDE");
     const bool trebleTestingOverride = env && !strcmp(env, "true");
     const bool vintfLegacy = (transport == Transport::EMPTY) && trebleTestingOverride;
-#else   // LIBHIDL_TARGET_TREBLE but not LIBHIDL_TARGET_DEBUGGABLE
+#else   // ENFORCE_VINTF_MANIFEST but not LIBHIDL_TARGET_DEBUGGABLE
     const bool trebleTestingOverride = false;
     const bool vintfLegacy = false;
 #endif  // LIBHIDL_TARGET_DEBUGGABLE
 
-#else   // not LIBHIDL_TARGET_TREBLE
+#else   // not ENFORCE_VINTF_MANIFEST
     const char* env = std::getenv("TREBLE_TESTING_OVERRIDE");
     const bool trebleTestingOverride = env && !strcmp(env, "true");
     const bool vintfLegacy = (transport == Transport::EMPTY);
-#endif  // LIBHIDL_TARGET_TREBLE
+#endif  // ENFORCE_VINTF_MANIFEST
 
     sp<Waiter> waiter = new Waiter(descriptor, instance, sm);
     while (!getStub && (vintfHwbinder || vintfLegacy)) {