diff --git a/Android.mk b/Android.mk
index 8c2ab78..2d849c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 
-ifneq ($(filter mondrianwifi,$(TARGET_DEVICE)),)
+ifneq ($(filter mondrianlte,$(TARGET_DEVICE)),)
 
-LOCAL_PATH := device/samsung/mondrianwifi/
+LOCAL_PATH := device/samsung/mondrianlte/
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index ad05873..d20bb3a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := device/samsung/mondrianwifi/
+LOCAL_PATH := device/samsung/mondrianlte/
 
-PRODUCT_MAKEFILES := $(LOCAL_PATH)/omni_mondrianwifi.mk
+PRODUCT_MAKEFILES := $(LOCAL_PATH)/omni_mondrianlte.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 691b180..5eb8505 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := device/samsung/mondrianwifi
+LOCAL_PATH := device/samsung/mondrianlte
 
 TARGET_BOARD_PLATFORM := msm8974
-TARGET_BOOTLOADER_BOARD_NAME := mondrianwifi
+TARGET_BOOTLOADER_BOARD_NAME := mondrianlte
 
 # Architecture
 TARGET_ARCH := arm
@@ -43,7 +43,7 @@ TW_INPUT_BLACKLIST := "hbtp_vm"
 TW_HAS_DOWNLOAD_MODE := true
 TW_NO_REBOOT_BOOTLOADER := true
 include $(LOCAL_PATH)/kernel.mk
-BOARD_CUSTOM_BOOTIMG_MK := device/samsung/mondrianwifi/seEnforcing.mk
+BOARD_CUSTOM_BOOTIMG_MK := device/samsung/mondrianlte/seEnforcing.mk
 LZMA_RAMDISK_TARGETS := boot,recovery
 
 # TWRP
diff --git a/omni_mondrianwifi.mk b/omni_mondrianlte.mk
similarity index 88%
rename from omni_mondrianwifi.mk
rename to omni_mondrianlte.mk
index 115950d..aeeca89 100644
--- a/omni_mondrianwifi.mk
+++ b/omni_mondrianlte.mk
@@ -15,8 +15,8 @@
 #
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-PRODUCT_DEVICE := mondrianwifi
-PRODUCT_NAME := omni_mondrianwifi
+PRODUCT_DEVICE := mondrianlte
+PRODUCT_NAME := omni_mondrianlte
 PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-T320
+PRODUCT_MODEL := SM-T325
 PRODUCT_MANUFACTURER := samsung
diff --git a/recovery.fstab b/recovery.fstab
index ab0d395..d1b9fc5 100644
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -14,13 +14,13 @@
 # limitations under the License.
 #
 
-/efs  ext4 /dev/block/mmcblk0p11 flags=display="EFS";backup=1
-/boot emmc /dev/block/mmcblk0p14 flags=display="Boot";backup=1
-/data ext4 /dev/block/mmcblk0p26 flags=display=backup=1 
-/system ext4 /dev/block/mmcblk0p23 flags=display="System";backup=1
-/cache ext4 /dev/block/mmcblk0p24 flags=display="Cache";backup=1
-/recovery emmc /dev/block/mmcblk0p15 flags=display="Recovery";backup=1
-/misc emmc /dev/block/mmcblk0p16 flags=display="Misc"
-/fimware-modem vfat /dev/block/mmcblk0p2 flags=display="modem";backup=1
-/external_sd auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="Micro SDcard";storage;wipeingui;removable
-/usb-otg auto /dev/block/sda1 /dev/block/sda flags=display="USB-OTG";storage;wipeingui;removable
+/efs            emmc        /dev/block/platform/msm_sdcc.1/by-name/efs          flags=display="EFS";backup=1
+/boot           emmc        /dev/block/platform/msm_sdcc.1/by-name/boot         flags=display="Boot";backup=1
+/data           ext4        /dev/block/platform/msm_sdcc.1/by-name/userdata     flags=display=backup=1;encryptable=footer;length=-16384
+/system         ext4        /dev/block/platform/msm_sdcc.1/by-name/system       flags=display="System";backup=1
+/cache          ext4        /dev/block/platform/msm_sdcc.1/by-name/cache        flags=display="Cache";backup=1
+/recovery       emmc        /dev/block/platform/msm_sdcc.1/by-name/recovery     flags=display="Recovery";backup=1
+/misc           emmc        /dev/block/platform/msm_sdcc.1/by-name/fota         flags=display="Misc"
+/modem          emmc        /dev/block/platform/msm_sdcc.1/by-name/modem        flags=display="modem";backup=1
+/external_sd    vfat        /dev/block/mmcblk1p1    /dev/block/mmcblk1          flags=display="Micro SDcard";storage;wipeingui;removable
+/usb-otg        vfat        /dev/block/sda1     /dev/block/sda                  flags=display="USB-OTG";storage;wipeingui;removable