diff --git a/BoardConfig.mk b/BoardConfig.mk
index e2619a7..d2d9364 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -23,7 +23,7 @@
 # inherit from common msm8960
 -include device/samsung/msm8960-common/BoardConfigCommon.mk
 
-TARGET_SPECIFIC_HEADER_PATH := device/samsung/hlte/include
+TARGET_SPECIFIC_HEADER_PATH := device/samsung/klte/include
 
 
 # overrides  msm8960
@@ -37,25 +37,25 @@ TARGET_KERNEL_CONFIG := msm8974_sec_defconfig
 TARGET_KERNEL_SELINUX_CONFIG := selinux_defconfig
 
 # Kernel
-BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F
+BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_PAGESIZE := 2048
-BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02900000 --tags_offset 0x02700000
+BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x00000100
 BOARD_KERNEL_SEPARATED_DT := true
 BOARD_CUSTOM_BOOTIMG_MK := device/samsung/hlte/mkbootimg.mk
 
 # Graphics
-BOARD_EGL_CFG := device/samsung/hlte/egl.cfg
+BOARD_EGL_CFG := device/samsung/klte/egl.cfg
 
 # Recovery
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
-BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/hlte/recovery/recovery_keys.c
+BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/klte/recovery/recovery_keys.c
 BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_23x41.h\"
 BOARD_USES_MMCUTILS := true
 BOARD_HAS_LARGE_FILESYSTEM := true
 BOARD_HAS_NO_MISC_PARTITION := true
 BOARD_HAS_NO_SELECT_BUTTON := true
-TARGET_RECOVERY_FSTAB := device/samsung/hlte/rootdir/etc/fstab.qcom
+TARGET_RECOVERY_FSTAB := device/samsung/klte/rootdir/etc/fstab.qcom
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 11534336
@@ -67,8 +67,8 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 BOARD_RECOVERY_SWIPE := true
 
 # bluetooth
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/hlte/bluetooth
-BOARD_BLUEDROID_VENDOR_CONF := device/samsung/hlte/bluetooth/vnd_hlte.txt
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/klte/bluetooth
+BOARD_BLUEDROID_VENDOR_CONF := device/samsung/klte/bluetooth/vnd_klte.txt
 BOARD_BLUETOOTH_USES_HCIATTACH_PROPERTY := false
 
 # NFC
@@ -86,7 +86,7 @@ TARGET_QCOM_AUDIO_VARIANT := caf
 TARGET_USES_QCOM_BSP := true
 
 # Audio settings
-BOARD_USES_CUSTOM_AUDIO_PLATFORM_PATH := device/samsung/hlte/audio/platform
+BOARD_USES_CUSTOM_AUDIO_PLATFORM_PATH := device/samsung/klte/audio/platform
 AUDIO_FEATURE_DISABLED_MULTI_VOICE_SESSIONS := true
 AUDIO_FEATURE_DISABLED_FM := true
 AUDIO_FEATURE_DISABLED_ANC_HEADSET := true
@@ -122,13 +122,13 @@ MAX_EGL_CACHE_KEY_SIZE := 12*1024
 MAX_EGL_CACHE_SIZE := 2048*1024
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := hltexx,hltespr,hltetmo,SM-N900T,hltecan,hlteatt,hltevzw,hlte
+TARGET_OTA_ASSERT_DEVICE := kltexx,kltespr,kltetmo,kltecan,klteatt,kltevzw,klte
 
-TARGET_KERNEL_VARIANT_CONFIG := msm8974_sec_hlte_eur_defconfig
+TARGET_KERNEL_VARIANT_CONFIG := msm8974_sec_klte_eur_defconfig
 
 # PowerHAL
 TARGET_POWERHAL_VARIANT := qcom
-TARGET_POWERHAL_SET_INTERACTIVE_EXT := device/samsung/hlte/power/power_ext.c
+TARGET_POWERHAL_SET_INTERACTIVE_EXT := device/samsung/klte/power/power_ext.c
 
 # The "new" GPS is really the old GPS, override it.
 BOARD_HAVE_NEW_QC_GPS :=
@@ -139,6 +139,6 @@ TARGET_NO_RPC := true
 # Vendor Init
 TARGET_UNIFIED_DEVICE := true
 TARGET_INIT_VENDOR_LIB := libinit_msm
-TARGET_LIBINIT_DEFINES_FILE := device/samsung/hlte/init/init_hlte.c
+TARGET_LIBINIT_DEFINES_FILE := device/samsung/klte/init/init_klte.c
 
-TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/hlte
+TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/klte
diff --git a/bluetooth/vnd_hlte.txt b/bluetooth/vnd_klte.txt
similarity index 100%
rename from bluetooth/vnd_hlte.txt
rename to bluetooth/vnd_klte.txt
diff --git a/cm.mk b/cm.mk
index aba2894..93bd280 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,4 +1,4 @@
-$(call inherit-product, device/samsung/hlte/full_hlte.mk)
+$(call inherit-product, device/samsung/klte/full_klte.mk)
 
 # Enhanced NFC
 $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
@@ -6,5 +6,5 @@ $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-PRODUCT_DEVICE := hlte
-PRODUCT_NAME := cm_hlte
+PRODUCT_DEVICE := klte
+PRODUCT_NAME := cm_klte
diff --git a/device.mk b/device.mk
index bcd2b67..ec9f843 100644
--- a/device.mk
+++ b/device.mk
@@ -17,10 +17,10 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
 ## Get non-open-source specific aspects
-$(call inherit-product-if-exists, vendor/samsung/hlte/hlte-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/klte/klte-vendor.mk)
 
 ## overlays
-DEVICE_PACKAGE_OVERLAYS += device/samsung/hlte/overlay
+DEVICE_PACKAGE_OVERLAYS += device/samsung/klte/overlay
 
 # Device uses high-density artwork where available
 PRODUCT_AAPT_CONFIG := normal hdpi xhdpi xxhdpi
@@ -32,9 +32,9 @@ TARGET_SCREEN_WIDTH := 1080
 
 # Audio configuration
 PRODUCT_COPY_FILES += \
-    device/samsung/hlte/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
-    device/samsung/hlte/audio/mixer_paths.xml:system/etc/mixer_paths.xml \
-    device/samsung/hlte/audio/audio_policy.conf:system/etc/audio_policy.conf \
+    device/samsung/klte/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
+    device/samsung/klte/audio/mixer_paths.xml:system/etc/mixer_paths.xml \
+    device/samsung/klte/audio/audio_policy.conf:system/etc/audio_policy.conf \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -49,7 +49,7 @@ PRODUCT_COPY_FILES += \
 
 # Media Profile
 PRODUCT_COPY_FILES += \
-    device/samsung/hlte/media/media_profiles.xml:system/etc/media_profiles.xml
+    device/samsung/klte/media/media_profiles.xml:system/etc/media_profiles.xml
 
 # Extended media support
 PRODUCT_PACKAGES += \
@@ -57,10 +57,6 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_BOOT_JARS += qcmediaplayer
 
-# support for epen
-PRODUCT_COPY_FILES += \
-    device/samsung/hlte/sec_e-pen.idc:system/usr/idc/sec_e-pen.idc
-
 # GPS
 PRODUCT_PACKAGES += \
     gps.msm8974 \
@@ -68,21 +64,21 @@ PRODUCT_PACKAGES += \
     libloc_core \
     libloc_eng
 
-GPS_CONF := device/samsung/hlte/gps/etc/gps.conf
+GPS_CONF := device/samsung/klte/gps/etc/gps.conf
 
 PRODUCT_COPY_FILES += \
     $(GPS_CONF):/system/etc/gps.conf \
-    device/samsung/hlte/gps/etc/sap.conf:/system/etc/sap.conf
+    device/samsung/klte/gps/etc/sap.conf:/system/etc/sap.conf
 
 # Keylayouts
 PRODUCT_COPY_FILES += \
-    device/samsung/hlte/keylayout/atmel_mxt_ts.kl:system/usr/keylayout/atmel_mxt_ts.kl \
-    device/samsung/hlte/keylayout/Button_Jack.kl:system/usr/keylayout/Button_Jack.kl \
-    device/samsung/hlte/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \
-    device/samsung/hlte/keylayout/philips_remote_ir.kl:system/usr/keylayout/philips_remote_ir.kl \
-    device/samsung/hlte/keylayout/samsung_remote_ir.kl:system/usr/keylayout/samsung_remote_ir.kl \
-    device/samsung/hlte/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \
-    device/samsung/hlte/keylayout/ue_rf4ce_remote.kl:system/usr/keylayout/ue_rf4ce_remote.kl
+    device/samsung/klte/keylayout/atmel_mxt_ts.kl:system/usr/keylayout/atmel_mxt_ts.kl \
+    device/samsung/klte/keylayout/Button_Jack.kl:system/usr/keylayout/Button_Jack.kl \
+    device/samsung/klte/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \
+    device/samsung/klte/keylayout/philips_remote_ir.kl:system/usr/keylayout/philips_remote_ir.kl \
+    device/samsung/klte/keylayout/samsung_remote_ir.kl:system/usr/keylayout/samsung_remote_ir.kl \
+    device/samsung/klte/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \
+    device/samsung/klte/keylayout/ue_rf4ce_remote.kl:system/usr/keylayout/ue_rf4ce_remote.kl
 
 # Ramdisk
 PRODUCT_PACKAGES += \
@@ -138,7 +134,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml
 
 # Nfc
-NFCEE_ACCESS_PATH := device/samsung/hlte/nfc/nfcee_access.xml
+NFCEE_ACCESS_PATH := device/samsung/klte/nfc/nfcee_access.xml
 
 ifeq ($(TARGET_NFC_TECH), nxp)
 PRODUCT_PACKAGES += \
@@ -163,9 +159,9 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_COPY_FILES += \
     $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml \
-    device/samsung/hlte/nfc/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf \
-    device/samsung/hlte/nfc/libnfc-brcm-20791b04.conf:system/etc/libnfc-brcm-20791b04.conf \
-    device/samsung/hlte/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf
+    device/samsung/klte/nfc/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf \
+    device/samsung/klte/nfc/libnfc-brcm-20791b04.conf:system/etc/libnfc-brcm-20791b04.conf \
+    device/samsung/klte/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf
 
 endif
 
@@ -216,8 +212,8 @@ PRODUCT_PACKAGES += \
 
 # Wifi
 PRODUCT_COPY_FILES += \
-   device/samsung/hlte/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
-   device/samsung/hlte/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf
+   device/samsung/klte/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
+   device/samsung/klte/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf
 
 # Keymaster
 PRODUCT_PACKAGES += \
diff --git a/extract-files.sh b/extract-files.sh
index 66bf784..b87a86e 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #set -e
-export DEVICE=hlte
+export DEVICE=klte
 export VENDOR=samsung
 
 if [ $# -eq 0 ]; then
diff --git a/full_hlte.mk b/full_klte.mk
similarity index 90%
rename from full_hlte.mk
rename to full_klte.mk
index 3796fd5..3c6071f 100644
--- a/full_hlte.mk
+++ b/full_klte.mk
@@ -25,12 +25,12 @@
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from hlte device
-$(call inherit-product, device/samsung/hlte/device.mk)
+$(call inherit-product, device/samsung/klte/device.mk)
 
 # Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := full_hltexx
-PRODUCT_DEVICE := hltexx
+PRODUCT_NAME := full_kltexx
+PRODUCT_DEVICE := kltexx
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := hlte
+PRODUCT_MODEL := klte
 
diff --git a/init/init_hlte.c b/init/init_klte.c
similarity index 84%
rename from init/init_hlte.c
rename to init/init_klte.c
index cfc4f37..6209c12 100755
--- a/init/init_hlte.c
+++ b/init/init_klte.c
@@ -54,32 +54,32 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
 
     property_get("ro.bootloader", bootloader);
 
-    if (strstr(bootloader, "N900W8")) {
+    if (strstr(bootloader, "G900W8")) {
         /* hltecan */
         property_set("ro.build.fingerprint", "samsung/hltevl/hltecan:4.3/JSS15J/N900W8VLUBMJ4:user/release-keys");
         property_set("ro.build.description", "hltevl-user 4.3 JSS15J N900W8VLUBMJ4 release-keys");
-        property_set("ro.product.model", "SM-N900W8");
+        property_set("ro.product.model", "SM-G900W8");
         property_set("ro.product.device", "hltecan");
         property_set("ro.telephony.ril.v3", "newDialCode");
-    } else if (strstr(bootloader, "N900P")) {
+    } else if (strstr(bootloader, "G900P")) {
         /* hltespr */
-        property_set("ro.build.fingerprint", "samsung/hltespr/hltespr:4.3/JSS15J/N900PVPUBMJ4:user/release-keys");
-        property_set("ro.build.description", "hltespr-user 4.3 JSS15J N900PVPUBMJ4 release-keys");
-        property_set("ro.product.model", "SM-N900P");
-        property_set("ro.product.device", "hltespr");
+        property_set("ro.build.fingerprint", "samsung/kltespr/kltespr:4.4.2/KOT49H/G900PVPU1ANCB:user/release-keys");
+        property_set("ro.build.description", "kltespr-user 4.4.2 KOT49H G900PVPU1ANCB release-keys");
+        property_set("ro.product.model", "SM-G900P");
+        property_set("ro.product.device", "kltespr");
         property_set("ro.telephony.ril.v3", "newDriverCallU,newDialCode");
-    } else if (strstr(bootloader, "N900T")) {
+    } else if (strstr(bootloader, "G900T")) {
         /* hltetmo */
         property_set("ro.build.fingerprint", "samsung/hltetmo/hltetmo:4.3/JSS15J/N900TUVUBMI7:user/release-keys");
         property_set("ro.build.description", "hltetmo-user 4.3 JSS15J N900TUVUBMI7 release-keys");
-        property_set("ro.product.model", "SM-N900T");
+        property_set("ro.product.model", "SM-G900T");
         property_set("ro.product.device", "hltetmo");
         property_set("ro.telephony.ril.v3", "newDialCode");
-    } else if (strstr(bootloader, "N900V")) {
+    } else if (strstr(bootloader, "G900V")) {
         /* hltevzw */
         property_set("ro.build.fingerprint", "Verizon/hltevzw/hltevzw:4.3/JSS15J/N900VOYUBMJ3:user/release-keys");
         property_set("ro.build.description", "hltevzw-user 4.3 JSS15J N900VOYUBMJ3 release-keys");
-        property_set("ro.product.model", "SM-N900V");
+        property_set("ro.product.model", "SM-G900V");
         property_set("ro.product.device", "hltevzw");
         property_set("ro.telephony.ril.v3", "newDriverCallU,newDialCode");
         property_set("ro.telephony.default_cdma_sub", "0");
@@ -89,7 +89,7 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
         /* hltexx */
         property_set("ro.build.fingerprint", "samsung/hltexx/hlte:4.3/JSS15J/N9005XXUBMH1:user/release-keys");
         property_set("ro.build.description", "hltexx-user 4.3 JSS15J N9005XXUBMH1 release-keys");
-        property_set("ro.product.model", "SM-N9005");
+        property_set("ro.product.model", "SM-G9005");
         property_set("ro.product.device", "hltexx");
         property_set("ro.telephony.ril.v3", "newDialCode");
     }
diff --git a/mkbootimg.mk b/mkbootimg.mk
index f5fdf82..60174ec 100644
--- a/mkbootimg.mk
+++ b/mkbootimg.mk
@@ -8,7 +8,7 @@ LOCAL_PATH := $(call my-dir)
 KERNEL_CONFIG := $(KERNEL_OUT)/.config
 G2_DTS_NAMES := msm8974
 
-G2_DTS_FILES = $(wildcard $(TOP)/$(TARGET_KERNEL_SOURCE)/arch/arm/boot/dts/msm8974/msm8974-sec-hlte-*.dts)
+G2_DTS_FILES = $(wildcard $(TOP)/$(TARGET_KERNEL_SOURCE)/arch/arm/boot/dts/msm8974/msm8974-sec-klte-*.dts)
 G2_DTS_FILE = $(lastword $(subst /, ,$(1)))
 DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call G2_DTS_FILE,$(1))))
 ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call G2_DTS_FILE,$(1))))