diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include
index b8ef982ee..cc094b90e 100644
--- a/boards/pba-d-01-kw2x/Makefile.include
+++ b/boards/pba-d-01-kw2x/Makefile.include
@@ -1,5 +1,5 @@
 # define the cpu used by the phyWAVE-KW22 board
-export CPU = kw2x
+export CPU = kw2xd
 export CPU_MODEL = kw21d256
 #export CPU_MODEL = kw21d512
 #export CPU_MODEL = kw22d512
diff --git a/cpu/kw2x/Makefile b/cpu/kw2xd/Makefile
similarity index 100%
rename from cpu/kw2x/Makefile
rename to cpu/kw2xd/Makefile
diff --git a/cpu/kw2x/Makefile.include b/cpu/kw2xd/Makefile.include
similarity index 93%
rename from cpu/kw2x/Makefile.include
rename to cpu/kw2xd/Makefile.include
index 9a931c989..0d656da2b 100644
--- a/cpu/kw2x/Makefile.include
+++ b/cpu/kw2xd/Makefile.include
@@ -1,4 +1,4 @@
-# define the CPU architecture for the kw2x
+# define the CPU architecture for the kw2xd
 export CPU_ARCH = cortex-m4
 
 # tell the build system that the CPU depends on the Kinetis common files
diff --git a/cpu/kw2x/cpu.c b/cpu/kw2xd/cpu.c
similarity index 98%
rename from cpu/kw2x/cpu.c
rename to cpu/kw2xd/cpu.c
index bcbffa75b..a822c6c94 100644
--- a/cpu/kw2x/cpu.c
+++ b/cpu/kw2xd/cpu.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     cpu_kw2x
+ * @ingroup     cpu_kw2xd
  * @{
  *
  * @file
diff --git a/cpu/kw2x/include/cpu_conf.h b/cpu/kw2xd/include/cpu_conf.h
similarity index 96%
rename from cpu/kw2x/include/cpu_conf.h
rename to cpu/kw2xd/include/cpu_conf.h
index d87306690..f0b67294e 100644
--- a/cpu/kw2x/include/cpu_conf.h
+++ b/cpu/kw2xd/include/cpu_conf.h
@@ -8,9 +8,9 @@
  */
 
 /**
- * @defgroup        cpu_kw2x KW2xD SiP
+ * @defgroup        cpu_kw2xd KW2xD SiP
  * @ingroup         cpu
- * @brief           CPU specific implementations for the Freescale KW2xD SiP.
+ * @brief           CPU specific implementations for the NXP/Freescale KW2xD SiP.
  *                  The SiP incorporates a low power 2.4 GHz transceiver and a
  *                  Kinetis Cortex-M4 MCU.
  * @{
diff --git a/cpu/kw2x/include/vendor/MKW22D5.h b/cpu/kw2xd/include/vendor/MKW22D5.h
similarity index 100%
rename from cpu/kw2x/include/vendor/MKW22D5.h
rename to cpu/kw2xd/include/vendor/MKW22D5.h
diff --git a/cpu/kw2x/ldscripts/kw21d256.ld b/cpu/kw2xd/ldscripts/kw21d256.ld
similarity index 100%
rename from cpu/kw2x/ldscripts/kw21d256.ld
rename to cpu/kw2xd/ldscripts/kw21d256.ld
diff --git a/cpu/kw2x/ldscripts/kw21d512.ld b/cpu/kw2xd/ldscripts/kw21d512.ld
similarity index 100%
rename from cpu/kw2x/ldscripts/kw21d512.ld
rename to cpu/kw2xd/ldscripts/kw21d512.ld
diff --git a/cpu/kw2x/ldscripts/kw22d512.ld b/cpu/kw2xd/ldscripts/kw22d512.ld
similarity index 100%
rename from cpu/kw2x/ldscripts/kw22d512.ld
rename to cpu/kw2xd/ldscripts/kw22d512.ld
diff --git a/cpu/kw2x/periph/Makefile b/cpu/kw2xd/periph/Makefile
similarity index 100%
rename from cpu/kw2x/periph/Makefile
rename to cpu/kw2xd/periph/Makefile
diff --git a/cpu/kw2x/vectors.c b/cpu/kw2xd/vectors.c
similarity index 99%
rename from cpu/kw2x/vectors.c
rename to cpu/kw2xd/vectors.c
index e9a9e34ba..ab7bea0aa 100644
--- a/cpu/kw2x/vectors.c
+++ b/cpu/kw2xd/vectors.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     cpu_kw2x
+ * @ingroup     cpu_kw2xd
  * @{
  *
  * @file