diff --git a/target/board/generic_arm5/AndroidBoard.mk b/target/board/generic_armv5/AndroidBoard.mk
similarity index 100%
rename from target/board/generic_arm5/AndroidBoard.mk
rename to target/board/generic_armv5/AndroidBoard.mk
diff --git a/target/board/generic_arm5/BoardConfig.mk b/target/board/generic_armv5/BoardConfig.mk
similarity index 100%
rename from target/board/generic_arm5/BoardConfig.mk
rename to target/board/generic_armv5/BoardConfig.mk
diff --git a/target/board/generic_arm5/README.txt b/target/board/generic_armv5/README.txt
similarity index 64%
rename from target/board/generic_arm5/README.txt
rename to target/board/generic_armv5/README.txt
index 0aca0ea05e..25d590af07 100644
--- a/target/board/generic_arm5/README.txt
+++ b/target/board/generic_armv5/README.txt
@@ -1,4 +1,4 @@
-The "generic_arm5" product defines a non-hardware-specific target
+The "generic_armv5" product defines a non-hardware-specific target
 without a kernel or bootloader.
 
 It is not a product "base class"; no other products inherit
diff --git a/target/board/generic_arm5/device.mk b/target/board/generic_armv5/device.mk
similarity index 100%
rename from target/board/generic_arm5/device.mk
rename to target/board/generic_armv5/device.mk
diff --git a/target/board/generic_arm5/system.prop b/target/board/generic_armv5/system.prop
similarity index 71%
rename from target/board/generic_arm5/system.prop
rename to target/board/generic_armv5/system.prop
index f2424c9704..137a0f9b1f 100644
--- a/target/board/generic_arm5/system.prop
+++ b/target/board/generic_armv5/system.prop
@@ -1,5 +1,5 @@
 #
-# system.prop for generic sdk 
+# system.prop for generic sdk
 #
 
 rild.libpath=/system/lib/libreference-ril.so
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index 2e80a1ffeb..694e906d43 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -35,7 +35,7 @@ else
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/core.mk \
     $(LOCAL_DIR)/generic.mk \
-    $(LOCAL_DIR)/generic_arm5.mk \
+    $(LOCAL_DIR)/generic_armv5.mk \
     $(LOCAL_DIR)/generic_x86.mk \
     $(LOCAL_DIR)/full.mk \
     $(LOCAL_DIR)/full_x86.mk \
diff --git a/target/product/generic_arm5.mk b/target/product/generic_armv5.mk
similarity index 90%
rename from target/product/generic_arm5.mk
rename to target/product/generic_armv5.mk
index 478839a17e..d419e70615 100644
--- a/target/product/generic_arm5.mk
+++ b/target/product/generic_armv5.mk
@@ -21,6 +21,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
 
 # Overrides
-PRODUCT_BRAND := generic_arm5
-PRODUCT_DEVICE := generic_arm5
-PRODUCT_NAME := generic_arm5
+PRODUCT_BRAND := generic_armv5
+PRODUCT_DEVICE := generic_armv5
+PRODUCT_NAME := generic_armv5