diff --git a/target/linux/mx2/Makefile b/target/linux/imx21/Makefile
similarity index 91%
rename from target/linux/mx2/Makefile
rename to target/linux/imx21/Makefile
index 8455884859..96a2784537 100644
--- a/target/linux/mx2/Makefile
+++ b/target/linux/imx21/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 ARCH:=arm
-BOARD:=mx2
-BOARDNAME:=Freescale MX2
+BOARD:=imx21
+BOARDNAME:=Freescale i.MX21
 FEATURES:=jffs2
 CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
 
diff --git a/target/linux/mx2/config-2.6.34 b/target/linux/imx21/config-2.6.34
similarity index 100%
rename from target/linux/mx2/config-2.6.34
rename to target/linux/imx21/config-2.6.34
diff --git a/target/linux/mx2/files/arch/arm/mach-mx2/mach-vp6500.c b/target/linux/imx21/files/arch/arm/mach-mx2/mach-vp6500.c
similarity index 100%
rename from target/linux/mx2/files/arch/arm/mach-mx2/mach-vp6500.c
rename to target/linux/imx21/files/arch/arm/mach-mx2/mach-vp6500.c
diff --git a/target/linux/mx2/files/arch/arm/plat-mxc/include/mach/board-vp6500.h b/target/linux/imx21/files/arch/arm/plat-mxc/include/mach/board-vp6500.h
similarity index 100%
rename from target/linux/mx2/files/arch/arm/plat-mxc/include/mach/board-vp6500.h
rename to target/linux/imx21/files/arch/arm/plat-mxc/include/mach/board-vp6500.h
diff --git a/target/linux/mx2/image/Makefile b/target/linux/imx21/image/Makefile
similarity index 100%
rename from target/linux/mx2/image/Makefile
rename to target/linux/imx21/image/Makefile
diff --git a/target/linux/mx2/patches-2.6.34/010-mach-vp6500.patch b/target/linux/imx21/patches-2.6.34/010-mach-vp6500.patch
similarity index 100%
rename from target/linux/mx2/patches-2.6.34/010-mach-vp6500.patch
rename to target/linux/imx21/patches-2.6.34/010-mach-vp6500.patch
diff --git a/target/linux/mx2/patches-2.6.34/011-mach-type.patch b/target/linux/imx21/patches-2.6.34/011-mach-type.patch
similarity index 100%
rename from target/linux/mx2/patches-2.6.34/011-mach-type.patch
rename to target/linux/imx21/patches-2.6.34/011-mach-type.patch
diff --git a/target/linux/mx2/patches-2.6.34/040-pwm.patch b/target/linux/imx21/patches-2.6.34/040-pwm.patch
similarity index 100%
rename from target/linux/mx2/patches-2.6.34/040-pwm.patch
rename to target/linux/imx21/patches-2.6.34/040-pwm.patch