diff --git a/platform/msmtitanium/acpuclock.c b/platform/msm8953/acpuclock.c
similarity index 100%
rename from platform/msmtitanium/acpuclock.c
rename to platform/msm8953/acpuclock.c
diff --git a/platform/msmtitanium/gpio.c b/platform/msm8953/gpio.c
similarity index 96%
rename from platform/msmtitanium/gpio.c
rename to platform/msm8953/gpio.c
index 05b4977..ddaf46b 100644
--- a/platform/msmtitanium/gpio.c
+++ b/platform/msm8953/gpio.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
diff --git a/platform/msmtitanium/include/platform/clock.h b/platform/msm8953/include/platform/clock.h
similarity index 98%
rename from platform/msmtitanium/include/platform/clock.h
rename to platform/msm8953/include/platform/clock.h
index 9743c08..b2e813b 100755
--- a/platform/msmtitanium/include/platform/clock.h
+++ b/platform/msm8953/include/platform/clock.h
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MSMTITANIUM_CLOCK_H
-#define __MSMTITANIUM_CLOCK_H
+#ifndef __MSM8953_CLOCK_H
+#define __MSM8953_CLOCK_H
 
 #include <clock.h>
 #include <clock_lib2.h>
diff --git a/platform/msmtitanium/include/platform/gpio.h b/platform/msm8953/include/platform/gpio.h
similarity index 94%
rename from platform/msmtitanium/include/platform/gpio.h
rename to platform/msm8953/include/platform/gpio.h
index 1d05ede..4bc9f69 100644
--- a/platform/msmtitanium/include/platform/gpio.h
+++ b/platform/msm8953/include/platform/gpio.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __PLATFORM_MSMTITANIUM_GPIO_H
-#define __PLATFORM_MSMTITANIUM_GPIO_H
+#ifndef __PLATFORM_MSM8953_GPIO_H
+#define __PLATFORM_MSM8953_GPIO_H
 
 #include <bits.h>
 #include <gpio.h>
diff --git a/platform/msmtitanium/include/platform/iomap.h b/platform/msm8953/include/platform/iomap.h
similarity index 99%
rename from platform/msmtitanium/include/platform/iomap.h
rename to platform/msm8953/include/platform/iomap.h
index b742d81..b162644 100644
--- a/platform/msmtitanium/include/platform/iomap.h
+++ b/platform/msm8953/include/platform/iomap.h
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PLATFORM_MSMTITANIUM_IOMAP_H_
-#define _PLATFORM_MSMTITANIUM_IOMAP_H_
+#ifndef _PLATFORM_MSM8953_IOMAP_H_
+#define _PLATFORM_MSM8953_IOMAP_H_
 
 #define MSM_IOMAP_BASE                     0x00000000
 #define MSM_IOMAP_END                      0x08000000
diff --git a/platform/msmtitanium/include/platform/irqs.h b/platform/msm8953/include/platform/irqs.h
similarity index 94%
rename from platform/msmtitanium/include/platform/irqs.h
rename to platform/msm8953/include/platform/irqs.h
index 6c0aebf..5470d77 100755
--- a/platform/msmtitanium/include/platform/irqs.h
+++ b/platform/msm8953/include/platform/irqs.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __IRQS_MSMTITANIUM_H
-#define __IRQS_MSMTITANIUM_H
+#ifndef __IRQS_MSM8953_H
+#define __IRQS_MSM8953_H
 
 /* MSM ACPU Interrupt Numbers */
 
@@ -63,4 +63,4 @@
                                                NR_BOARD_IRQS)
 
 #define SMD_IRQ                                (GIC_SPI_START + 168)
-#endif /* __IRQS_MSMTITANIUM_H */
+#endif /* __IRQS_MSM8953_H */
diff --git a/platform/msmtitanium/msmtitanium-clock.c b/platform/msm8953/msm8953-clock.c
similarity index 98%
rename from platform/msmtitanium/msmtitanium-clock.c
rename to platform/msm8953/msm8953-clock.c
index 5401eb1..3df3ebd 100755
--- a/platform/msmtitanium/msmtitanium-clock.c
+++ b/platform/msm8953/msm8953-clock.c
@@ -685,7 +685,7 @@
 };
 
 /* Clock lookup table */
-static struct clk_lookup msm_clocks_titanium[] =
+static struct clk_lookup msm_clocks_8953[] =
 {
 	CLK_LOOKUP("sdc1_iface_clk", gcc_sdcc1_ahb_clk.c),
 	CLK_LOOKUP("sdc1_core_clk",  gcc_sdcc1_apps_clk.c),
@@ -724,5 +724,5 @@
 
 void platform_clock_init(void)
 {
-	clk_init(msm_clocks_titanium, ARRAY_SIZE(msm_clocks_titanium));
+	clk_init(msm_clocks_8953, ARRAY_SIZE(msm_clocks_8953));
 }
diff --git a/platform/msmtitanium/platform.c b/platform/msm8953/platform.c
similarity index 100%
rename from platform/msmtitanium/platform.c
rename to platform/msm8953/platform.c
diff --git a/platform/msmtitanium/rules.mk b/platform/msm8953/rules.mk
similarity index 93%
rename from platform/msmtitanium/rules.mk
rename to platform/msm8953/rules.mk
index 0b01b60..6d840e6 100755
--- a/platform/msmtitanium/rules.mk
+++ b/platform/msm8953/rules.mk
@@ -21,7 +21,7 @@
 OBJS += \
        $(LOCAL_DIR)/platform.o \
        $(LOCAL_DIR)/acpuclock.o \
-       $(LOCAL_DIR)/msmtitanium-clock.o \
+       $(LOCAL_DIR)/msm8953-clock.o \
        $(LOCAL_DIR)/gpio.o
 
 LINKER_SCRIPT += $(BUILDDIR)/system-onesegment.ld
diff --git a/platform/msm_shared/include/mdp5.h b/platform/msm_shared/include/mdp5.h
index 4a8d137..05cd121 100644
--- a/platform/msm_shared/include/mdp5.h
+++ b/platform/msm_shared/include/mdp5.h
@@ -94,7 +94,7 @@
 #define MDSS_MDP_HW_REV_111    MDSS_MDP_REV(1, 11, 0) /* 8956 v1.0 */
 #define MDSS_MDP_HW_REV_112    MDSS_MDP_REV(1, 12, 0) /* 8952 v1.0 */
 #define MDSS_MDP_HW_REV_114    MDSS_MDP_REV(1, 14, 0) /* 8937 v1.0 */
-#define MDSS_MDP_HW_REV_116    MDSS_MDP_REV(1, 16, 0) /* msmtitanium */
+#define MDSS_MDP_HW_REV_116    MDSS_MDP_REV(1, 16, 0) /* msm8953 */
 #define MDSS_MDP_HW_REV_115    MDSS_MDP_REV(1, 15, 0) /* msmgold v1.0 */
 #define MDSS_MDP_HW_REV_200    MDSS_MDP_REV(2, 0, 0) /* 8092 v1.0 */
 
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index eebd8c9..5728b92 100755
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -616,7 +616,7 @@
 			$(LOCAL_DIR)/mipi_dsi_autopll.o
 endif
 
-ifeq ($(PLATFORM),msmtitanium)
+ifeq ($(PLATFORM),msm8953)
 DEFINES += DISPLAY_TYPE_MDSS=1
 	OBJS += $(LOCAL_DIR)/qgic.o \
 			$(LOCAL_DIR)/qtimer.o \
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index 5819d69..8ea4a1e 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -444,14 +444,14 @@
 	MDM9307  = 298,
 	MDM9628  = 299,
 	APQ8096  = 291,
-	MSMTITANIUM  = 293,
+	MSM8953  = 293,
 	MSM8937 = 294,
 	APQ8037 = 295,
 	MSMGOLD = 303,
 	APQGOLD = 307,
 	MSMGOLD2 = 308,
 	MSMGOLD3 = 309,
-	APQTITANIUM = 304,
+	APQ8053 = 304,
 };
 
 enum platform {
diff --git a/project/msmtitanium.mk b/project/msm8953.mk
similarity index 95%
rename from project/msmtitanium.mk
rename to project/msm8953.mk
index d213104..a26cadf 100644
--- a/project/msmtitanium.mk
+++ b/project/msm8953.mk
@@ -1,8 +1,8 @@
-# top level project rules for the MSMTITANIUM project
+# top level project rules for the MSM8953 project
 #
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-TARGET := msmtitanium
+TARGET := msm8953
 
 MODULES += app/aboot
 
diff --git a/target/init.c b/target/init.c
index ca64cd1..728402d 100644
--- a/target/init.c
+++ b/target/init.c
@@ -274,8 +274,8 @@
 		case MSMGOLD2:
 		case MSMGOLD3:
 		case APQGOLD:
-		case MSMTITANIUM:
-		case APQTITANIUM:
+		case MSM8953:
+		case APQ8053:
 			config->vib_type = VIB_LRA_TYPE;
 			config->hap_rate_cfg1 = QPNP_HAP_RATE_CFG1_41;
 			config->hap_rate_cfg2 = QPNP_HAP_RATE_CFG2_03;
diff --git a/target/msmtitanium/include/target/display.h b/target/msm8953/include/target/display.h
similarity index 97%
rename from target/msmtitanium/include/target/display.h
rename to target/msm8953/include/target/display.h
index 461cd36..a57620b 100755
--- a/target/msmtitanium/include/target/display.h
+++ b/target/msm8953/include/target/display.h
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ifndef _TARGET_MSMTITANIUM_DISPLAY_H
-#define _TARGET_MSMTITANIUM_DISPLAY_H
+#ifndef _TARGET_MSM8953_DISPLAY_H
+#define _TARGET_MSM8953_DISPLAY_H
 
 /*---------------------------------------------------------------------------*/
 /* HEADER files                                                              */
diff --git a/target/msmtitanium/init.c b/target/msm8953/init.c
similarity index 99%
rename from target/msmtitanium/init.c
rename to target/msm8953/init.c
index 9d53acd..f25742b 100644
--- a/target/msmtitanium/init.c
+++ b/target/msm8953/init.c
@@ -316,10 +316,10 @@
 	platform = board->platform;
 
 	switch(platform) {
-	case MSMTITANIUM:
+	case MSM8953:
 		board->baseband = BASEBAND_MSM;
 		break;
-	case APQTITANIUM:
+	case APQ8053:
 		board->baseband = BASEBAND_APQ;
 		break;
 	default:
diff --git a/target/msmtitanium/mdtp_defs.c b/target/msm8953/mdtp_defs.c
similarity index 100%
rename from target/msmtitanium/mdtp_defs.c
rename to target/msm8953/mdtp_defs.c
diff --git a/target/msmtitanium/meminfo.c b/target/msm8953/meminfo.c
similarity index 97%
rename from target/msmtitanium/meminfo.c
rename to target/msm8953/meminfo.c
index b2f46df..23e82fd 100644
--- a/target/msmtitanium/meminfo.c
+++ b/target/msm8953/meminfo.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
diff --git a/target/msmtitanium/oem_panel.c b/target/msm8953/oem_panel.c
similarity index 100%
rename from target/msmtitanium/oem_panel.c
rename to target/msm8953/oem_panel.c
diff --git a/target/msmtitanium/regulator.c b/target/msm8953/regulator.c
similarity index 100%
rename from target/msmtitanium/regulator.c
rename to target/msm8953/regulator.c
diff --git a/target/msmtitanium/rules.mk b/target/msm8953/rules.mk
similarity index 97%
rename from target/msmtitanium/rules.mk
rename to target/msm8953/rules.mk
index 2a9eea6..1495f87 100644
--- a/target/msmtitanium/rules.mk
+++ b/target/msm8953/rules.mk
@@ -8,7 +8,7 @@
 INCLUDES += -I$(LK_TOP_DIR)/app/aboot
 endif
 
-PLATFORM := msmtitanium
+PLATFORM := msm8953
 
 MEMBASE := 0x8F600000 # SDRAM
 MEMSIZE := 0x00400000 # 1MB
diff --git a/target/msmtitanium/target_display.c b/target/msm8953/target_display.c
similarity index 100%
rename from target/msmtitanium/target_display.c
rename to target/msm8953/target_display.c
diff --git a/target/msmtitanium/tools/makefile b/target/msm8953/tools/makefile
similarity index 100%
rename from target/msmtitanium/tools/makefile
rename to target/msm8953/tools/makefile