diff --git a/leo.mk b/leo.mk
index f8009bc..a247bc2 100755
--- a/leo.mk
+++ b/leo.mk
@@ -79,8 +79,8 @@ PRODUCT_COPY_FILES += \
 
 # Keylayouts
 PRODUCT_COPY_FILES += \
-    device/htc/leo/prebuilt/keylayout/leo-keypad.kl:system/usr/keylayout/leo-keypad.kl \
-    device/htc/leo/prebuilt/keylayout/leo-keypad.kcm.bin:system/usr/keychars/leo-keypad.kcm.bin \
+    device/htc/leo/prebuilt/keylayout/htcleo-keypad.kl:system/usr/keylayout/htcleo-keypad.kl \
+    device/htc/leo/prebuilt/keylayout/htcleo-keypad.kcm.bin:system/usr/keychars/htcleo-keypad.kcm.bin \
     device/htc/leo/prebuilt/keylayout/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl
 
 # Firmware
diff --git a/prebuilt/keylayout/leo-keypad.kcm.bin b/prebuilt/keylayout/htcleo-keypad.kcm.bin
similarity index 100%
rename from prebuilt/keylayout/leo-keypad.kcm.bin
rename to prebuilt/keylayout/htcleo-keypad.kcm.bin
diff --git a/prebuilt/keylayout/leo-keypad.kl b/prebuilt/keylayout/htcleo-keypad.kl
similarity index 100%
rename from prebuilt/keylayout/leo-keypad.kl
rename to prebuilt/keylayout/htcleo-keypad.kl