diff --git a/.gitignore b/.gitignore
index 124880066..5729e7464 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
 *.esb
 *.avr-raven
 *.exp5438
-*.mb851
+*.mbxxx
 *.win32
 *.apple2enh
 *.atari
diff --git a/cpu/stm32w108/board-sensors.h b/cpu/stm32w108/board-sensors.h
index 9c773d4df..aab1c649d 100644
--- a/cpu/stm32w108/board-sensors.h
+++ b/cpu/stm32w108/board-sensors.h
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/cfs-coffee-arch.c b/cpu/stm32w108/cfs-coffee-arch.c
index 1b7a08d9a..c34aa293e 100644
--- a/cpu/stm32w108/cfs-coffee-arch.c
+++ b/cpu/stm32w108/cfs-coffee-arch.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/cfs-coffee-arch.h b/cpu/stm32w108/cfs-coffee-arch.h
index 7ce8473a7..5d9db96d2 100644
--- a/cpu/stm32w108/cfs-coffee-arch.h
+++ b/cpu/stm32w108/cfs-coffee-arch.h
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/clock.c b/cpu/stm32w108/clock.c
index 6df0ac5c0..65b8c4d64 100644
--- a/cpu/stm32w108/clock.c
+++ b/cpu/stm32w108/clock.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/elfloader-arch.c b/cpu/stm32w108/elfloader-arch.c
index 6a04d45f0..14af29a5a 100644
--- a/cpu/stm32w108/elfloader-arch.c
+++ b/cpu/stm32w108/elfloader-arch.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/leds-arch.c b/cpu/stm32w108/leds-arch.c
index 1d9bdb50b..1357c6a0f 100644
--- a/cpu/stm32w108/leds-arch.c
+++ b/cpu/stm32w108/leds-arch.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/mtarch.h b/cpu/stm32w108/mtarch.h
index f4da378ee..91615bda7 100644
--- a/cpu/stm32w108/mtarch.h
+++ b/cpu/stm32w108/mtarch.h
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/rand.c b/cpu/stm32w108/rand.c
index a9a33306e..6e881c9bd 100644
--- a/cpu/stm32w108/rand.c
+++ b/cpu/stm32w108/rand.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/rtimer-arch.c b/cpu/stm32w108/rtimer-arch.c
index 5599797be..e9ae5d3dc 100644
--- a/cpu/stm32w108/rtimer-arch.c
+++ b/cpu/stm32w108/rtimer-arch.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/rtimer-arch.h b/cpu/stm32w108/rtimer-arch.h
index cb5090617..638136d2f 100644
--- a/cpu/stm32w108/rtimer-arch.h
+++ b/cpu/stm32w108/rtimer-arch.h
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/slip-uart1.c b/cpu/stm32w108/slip-uart1.c
index 904fd964d..396881055 100644
--- a/cpu/stm32w108/slip-uart1.c
+++ b/cpu/stm32w108/slip-uart1.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/uip-arch.c b/cpu/stm32w108/uip-arch.c
index 4646dc919..15a27206c 100644
--- a/cpu/stm32w108/uip-arch.c
+++ b/cpu/stm32w108/uip-arch.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/cpu/stm32w108/watchdog.c b/cpu/stm32w108/watchdog.c
index 6591bfaa2..73cb3afda 100644
--- a/cpu/stm32w108/watchdog.c
+++ b/cpu/stm32w108/watchdog.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup mb851-platform
+ * \addtogroup mbxxx-platform
  *
  * @{
  */
diff --git a/platform/mbxxx/dev/mems.c b/platform/mbxxx/dev/mems.c
index ba1764b11..95409fac0 100644
--- a/platform/mbxxx/dev/mems.c
+++ b/platform/mbxxx/dev/mems.c
@@ -8,7 +8,7 @@
 * Author             : MCD Application Team
 * Version            : V1.0
 * Date               : September 2009
-* Description        : Driver for leds management on STM32W108 MB851 board
+* Description        : Driver for leds management on STM32W108 MBXXX boards
 ********************************************************************************
 * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
 * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
diff --git a/regression-tests/01-compile/Makefile b/regression-tests/01-compile/Makefile
index 3b4c92335..4394abc73 100644
--- a/regression-tests/01-compile/Makefile
+++ b/regression-tests/01-compile/Makefile
@@ -6,7 +6,7 @@ hello-world/avr-raven \
 hello-world/econotag \
 hello-world/esb \
 hello-world/exp5438 \
-hello-world/mb851 \
+hello-world/mbxxx \
 hello-world/micaz \
 hello-world/minimal-net \
 hello-world/native \
diff --git a/regression-tests/Makefile.compile-test b/regression-tests/Makefile.compile-test
index 1da37f804..f6d7aa087 100644
--- a/regression-tests/Makefile.compile-test
+++ b/regression-tests/Makefile.compile-test
@@ -40,7 +40,7 @@ addzero = $(if $(call gt,${nine},$(1)),$(words ${1}),0$(words ${1}))
 define dooneexample
 @echo Building example $(3): $(1) for target $(2)
 @((cd $(EXAMPLESDIR)/$(1); \
- make TARGET=$(2) clean && make TARGET=$(2)) > \
+ make TARGET=$(2) CPUREV=xB clean && make CPUREV=xB TARGET=$(2)) > \
       $(3)-$(subst /,-,$(1))$(2).report 2>&1 && \
  (echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \
  (echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(subst /,-,$(1))$(2).summary ; \
diff --git a/tools/stm32w/uip6_bridge/Makefile b/tools/stm32w/uip6_bridge/Makefile
index eaafe7e53..a1116deca 100644
--- a/tools/stm32w/uip6_bridge/Makefile
+++ b/tools/stm32w/uip6_bridge/Makefile
@@ -10,7 +10,7 @@ DEFINES=PROJECT_CONF_H=\"bridge-conf.h\"
 UIP_CONF_IPV6=1
 
 ifndef TARGET
-TARGET=mb851
+TARGET=mbxxx
 endif
 
 PROJECTDIRS = dev