diff --git a/platform/mdmfermium/acpuclock.c b/platform/mdm9607/acpuclock.c
similarity index 100%
rename from platform/mdmfermium/acpuclock.c
rename to platform/mdm9607/acpuclock.c
diff --git a/platform/mdmfermium/gpio.c b/platform/mdm9607/gpio.c
similarity index 100%
rename from platform/mdmfermium/gpio.c
rename to platform/mdm9607/gpio.c
diff --git a/platform/mdmfermium/include/platform/clock.h b/platform/mdm9607/include/platform/clock.h
similarity index 96%
rename from platform/mdmfermium/include/platform/clock.h
rename to platform/mdm9607/include/platform/clock.h
index e3811ff..6d00491 100644
--- a/platform/mdmfermium/include/platform/clock.h
+++ b/platform/mdm9607/include/platform/clock.h
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MDMFERMIUM_CLOCK_H
-#define __MDMFERMIUM_CLOCK_H
+#ifndef __MDM9607_CLOCK_H
+#define __MDM9607_CLOCK_H
 
 #include <clock.h>
 #include <clock_lib2.h>
diff --git a/platform/mdmfermium/include/platform/gpio.h b/platform/mdm9607/include/platform/gpio.h
similarity index 96%
rename from platform/mdmfermium/include/platform/gpio.h
rename to platform/mdm9607/include/platform/gpio.h
index aa3a38e..f7c6293 100644
--- a/platform/mdmfermium/include/platform/gpio.h
+++ b/platform/mdm9607/include/platform/gpio.h
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __PLATFORM_MDMFERMIUM_GPIO_H
-#define __PLATFORM_MDMFERMIUM_GPIO_H
+#ifndef __PLATFORM_MDM9607_GPIO_H
+#define __PLATFORM_MDM9607_GPIO_H
 
 #include <bits.h>
 #include <gpio.h>
diff --git a/platform/mdmfermium/include/platform/iomap.h b/platform/mdm9607/include/platform/iomap.h
similarity index 98%
rename from platform/mdmfermium/include/platform/iomap.h
rename to platform/mdm9607/include/platform/iomap.h
index 205cd19..c933148 100644
--- a/platform/mdmfermium/include/platform/iomap.h
+++ b/platform/mdm9607/include/platform/iomap.h
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PLATFORM_MDMFERMIUM_IOMAP_H_
-#define _PLATFORM_MDMFERMIUM_IOMAP_H_
+#ifndef _PLATFORM_MDM9607_IOMAP_H_
+#define _PLATFORM_MDM9607_IOMAP_H_
 
 #define MSM_IOMAP_BASE                     0x00000000
 #define MSM_IOMAP_END                      0x08000000
diff --git a/platform/mdmfermium/include/platform/irqs.h b/platform/mdm9607/include/platform/irqs.h
similarity index 96%
rename from platform/mdmfermium/include/platform/irqs.h
rename to platform/mdm9607/include/platform/irqs.h
index 8738b97..2c22fd5 100644
--- a/platform/mdmfermium/include/platform/irqs.h
+++ b/platform/mdm9607/include/platform/irqs.h
@@ -26,8 +26,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __IRQS_MDMFERMIUM_H
-#define __IRQS_MDMFERMIUM_H
+#ifndef __IRQS_MDM9607_H
+#define __IRQS_MDM9607_H
 
 /* MSM ACPU Interrupt Numbers */
 
@@ -61,4 +61,4 @@
 #define NR_IRQS                                (NR_MSM_IRQS + NR_GPIO_IRQS + \
                                                NR_BOARD_IRQS)
 
-#endif /* __IRQS_MDMFERMIUM_H */
+#endif /* __IRQS_MDM9607_H */
diff --git a/platform/mdmfermium/mdmfermium-clock.c b/platform/mdm9607/mdm9607-clock.c
similarity index 97%
rename from platform/mdmfermium/mdmfermium-clock.c
rename to platform/mdm9607/mdm9607-clock.c
index 35fbd27..fc1e85a 100644
--- a/platform/mdmfermium/mdmfermium-clock.c
+++ b/platform/mdm9607/mdm9607-clock.c
@@ -217,7 +217,7 @@
 };
 
 /* Clock lookup table */
-static struct clk_lookup mdm_clocks_fermium[] =
+static struct clk_lookup mdm_clocks_9607[] =
 {
 	CLK_LOOKUP("uart5_iface_clk", gcc_blsp1_ahb_clk.c),
 	CLK_LOOKUP("uart5_core_clk",  gcc_blsp1_uart5_apps_clk.c),
@@ -229,5 +229,5 @@
 
 void platform_clock_init(void)
 {
-	clk_init(mdm_clocks_fermium, ARRAY_SIZE(mdm_clocks_fermium));
+	clk_init(mdm_clocks_9607, ARRAY_SIZE(mdm_clocks_9607));
 }
diff --git a/platform/mdmfermium/platform.c b/platform/mdm9607/platform.c
similarity index 100%
rename from platform/mdmfermium/platform.c
rename to platform/mdm9607/platform.c
diff --git a/platform/mdmfermium/rules.mk b/platform/mdm9607/rules.mk
similarity index 92%
rename from platform/mdmfermium/rules.mk
rename to platform/mdm9607/rules.mk
index d5f789a..b341ee5 100644
--- a/platform/mdmfermium/rules.mk
+++ b/platform/mdm9607/rules.mk
@@ -16,7 +16,7 @@
        $(LOCAL_DIR)/platform.o \
        $(LOCAL_DIR)/acpuclock.o \
        $(LOCAL_DIR)/gpio.o \
-       $(LOCAL_DIR)/mdmfermium-clock.o
+       $(LOCAL_DIR)/mdm9607-clock.o
 
 LINKER_SCRIPT += $(BUILDDIR)/system-onesegment.ld
 
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index 385bc66..bce48b9 100644
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -521,7 +521,7 @@
 			$(LOCAL_DIR)/mipi_dsi_autopll.o
 endif
 
-ifeq ($(PLATFORM),mdmfermium)
+ifeq ($(PLATFORM),mdm9607)
 	OBJS += $(LOCAL_DIR)/qgic.o \
 			$(LOCAL_DIR)/qtimer.o \
 			$(LOCAL_DIR)/qtimer_mmap.o \
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index fe89eea..c883fa2 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -438,11 +438,11 @@
 	MDMCALIFORNIUM4  = 285,
 	MDMCALIFORNIUM5  = 286,
 	APQ8052  = 289,
-	MDMFERMIUM1 = 290,
-	MDMFERMIUM2  = 296,
-	MDMFERMIUM3  = 297,
-	MDMFERMIUM4  = 298,
-	MDMFERMIUM5  = 299,
+	MDM9607 = 290,
+	MDM8207  = 296,
+	MDM9207  = 297,
+	MDM9307  = 298,
+	MDM9628  = 299,
 	APQ8096  = 291,
 	MSMTITANIUM  = 293,
 	MSM8937 = 294,
diff --git a/project/mdmfermium.mk b/project/mdm9607.mk
similarity index 87%
rename from project/mdmfermium.mk
rename to project/mdm9607.mk
index 96de0cb..b8ef8de 100644
--- a/project/mdmfermium.mk
+++ b/project/mdm9607.mk
@@ -1,8 +1,8 @@
-# top level project rules for the fermium project
+# top level project rules for the mdm9607 project
 #
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-TARGET := mdmfermium
+TARGET := mdm9607
 
 MODULES += app/aboot
 
diff --git a/target/mdmfermium/init.c b/target/mdm9607/init.c
similarity index 98%
rename from target/mdmfermium/init.c
rename to target/mdm9607/init.c
index 383cbdd..1fba03c 100644
--- a/target/mdmfermium/init.c
+++ b/target/mdm9607/init.c
@@ -207,11 +207,11 @@
 
 	switch(platform)
 	{
-	case MDMFERMIUM1:
-	case MDMFERMIUM2:
-	case MDMFERMIUM3:
-	case MDMFERMIUM4:
-	case MDMFERMIUM5:
+	case MDM9607:
+	case MDM8207:
+	case MDM9207:
+	case MDM9307:
+	case MDM9628:
 		board->baseband = BASEBAND_MDM;
         break;
 	default:
diff --git a/target/mdmfermium/keypad.c b/target/mdm9607/keypad.c
similarity index 100%
rename from target/mdmfermium/keypad.c
rename to target/mdm9607/keypad.c
diff --git a/target/mdmfermium/meminfo.c b/target/mdm9607/meminfo.c
similarity index 100%
rename from target/mdmfermium/meminfo.c
rename to target/mdm9607/meminfo.c
diff --git a/target/mdmfermium/rules.mk b/target/mdm9607/rules.mk
similarity index 98%
rename from target/mdmfermium/rules.mk
rename to target/mdm9607/rules.mk
index 0bee605..a0d454e 100644
--- a/target/mdmfermium/rules.mk
+++ b/target/mdm9607/rules.mk
@@ -2,7 +2,7 @@
 
 INCLUDES += -I$(LOCAL_DIR)/include -I$(LK_TOP_DIR)/platform/msm_shared
 
-PLATFORM := mdmfermium
+PLATFORM := mdm9607
 
 MEMBASE := 0x82900000 # SDRAM
 MEMSIZE := 0x00100000 # 1MB
diff --git a/target/mdmfermium/tools/makefile b/target/mdm9607/tools/makefile
similarity index 100%
rename from target/mdmfermium/tools/makefile
rename to target/mdm9607/tools/makefile