diff --git a/transport/base/1.0/Android.mk b/transport/base/1.0/Android.mk
index 1e07a22..61b173b 100644
--- a/transport/base/1.0/Android.mk
+++ b/transport/base/1.0/Android.mk
@@ -15,7 +15,7 @@
 #
 # Build IBase.hal
 #
-GEN := $(intermediates)/android/hidl/base/1.0/IBase.java
+GEN := $(intermediates)/android/hidl/base/V1_0/IBase.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
@@ -46,7 +46,7 @@
 #
 # Build IBase.hal
 #
-GEN := $(intermediates)/android/hidl/base/1.0/IBase.java
+GEN := $(intermediates)/android/hidl/base/V1_0/IBase.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
diff --git a/transport/manager/1.0/Android.mk b/transport/manager/1.0/Android.mk
index 1d1b508..f805075 100644
--- a/transport/manager/1.0/Android.mk
+++ b/transport/manager/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build IServiceManager.hal
 #
-GEN := $(intermediates)/android/hidl/manager/1.0/IServiceManager.java
+GEN := $(intermediates)/android/hidl/manager/V1_0/IServiceManager.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IServiceManager.hal
@@ -40,7 +40,7 @@
 #
 # Build IServiceNotification.hal
 #
-GEN := $(intermediates)/android/hidl/manager/1.0/IServiceNotification.java
+GEN := $(intermediates)/android/hidl/manager/V1_0/IServiceNotification.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IServiceNotification.hal
@@ -75,7 +75,7 @@
 #
 # Build IServiceManager.hal
 #
-GEN := $(intermediates)/android/hidl/manager/1.0/IServiceManager.java
+GEN := $(intermediates)/android/hidl/manager/V1_0/IServiceManager.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IServiceManager.hal
@@ -96,7 +96,7 @@
 #
 # Build IServiceNotification.hal
 #
-GEN := $(intermediates)/android/hidl/manager/1.0/IServiceNotification.java
+GEN := $(intermediates)/android/hidl/manager/V1_0/IServiceNotification.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IServiceNotification.hal