diff --git a/boards/airfy-beacon/Makefile b/boards/airfy-beacon/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/airfy-beacon/Makefile
+++ b/boards/airfy-beacon/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/arduino-due/Makefile b/boards/arduino-due/Makefile
index 9853e690f5f56970bc393da6c28e8cde5efcc274..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/arduino-due/Makefile
+++ b/boards/arduino-due/Makefile
@@ -1,8 +1,3 @@
-
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
-
-# add a list of board specific subdirectories that should also be build
-DIRS =
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/arduino-mega2560/Makefile b/boards/arduino-mega2560/Makefile
index aa1b315c5d7f9bdc411079eac899d17ea7692a3b..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/arduino-mega2560/Makefile
+++ b/boards/arduino-mega2560/Makefile
@@ -1,3 +1,3 @@
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/avsextrem/Makefile b/boards/avsextrem/Makefile
index 60612c88c8b2447fadd88b00f5a1fe7c3778c074..adadebde0da392edd7e03bf1631a9b98d09547ca 100644
--- a/boards/avsextrem/Makefile
+++ b/boards/avsextrem/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = drivers $(RIOTBOARD)/msba2-common
 
diff --git a/boards/avsextrem/drivers/Makefile b/boards/avsextrem/drivers/Makefile
index 261c3e526594c2af6f0403259e58e1f88e3fe9fb..6c41c517bd1b2ba9631cb76713bbbba3bc73d2ae 100644
--- a/boards/avsextrem/drivers/Makefile
+++ b/boards/avsextrem/drivers/Makefile
@@ -1,4 +1,4 @@
-MODULE =avsextrem_base
+MODULE = board
 include $(RIOTBOARD)/$(BOARD)/Makefile.include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/cc2538dk/Makefile b/boards/cc2538dk/Makefile
index 3333dce58b8beec15963a929543e979df80c2efb..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/cc2538dk/Makefile
+++ b/boards/cc2538dk/Makefile
@@ -1,4 +1,3 @@
-# Tell the Makefile.base which module to build:
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/chronos/Makefile b/boards/chronos/Makefile
index 17c1af8c7cf4657202db7611f9efff897aec217e..2c34df46265245117d07d0ee3d307947d6b6b5fb 100644
--- a/boards/chronos/Makefile
+++ b/boards/chronos/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
 DIRS = drivers
diff --git a/boards/chronos/drivers/Makefile b/boards/chronos/drivers/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/chronos/drivers/Makefile
+++ b/boards/chronos/drivers/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/ek-lm4f120xl/Makefile b/boards/ek-lm4f120xl/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/ek-lm4f120xl/Makefile
+++ b/boards/ek-lm4f120xl/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/f4vi1/Makefile b/boards/f4vi1/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/f4vi1/Makefile
+++ b/boards/f4vi1/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/fox/Makefile b/boards/fox/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/fox/Makefile
+++ b/boards/fox/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/frdm-k64f/Makefile b/boards/frdm-k64f/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/frdm-k64f/Makefile
+++ b/boards/frdm-k64f/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/iotlab-m3/Makefile b/boards/iotlab-m3/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/iotlab-m3/Makefile
+++ b/boards/iotlab-m3/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/limifrog-v1/Makefile b/boards/limifrog-v1/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/limifrog-v1/Makefile
+++ b/boards/limifrog-v1/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/mbed_lpc1768/Makefile b/boards/mbed_lpc1768/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/mbed_lpc1768/Makefile
+++ b/boards/mbed_lpc1768/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/msb-430-common/Makefile b/boards/msb-430-common/Makefile
index 41a2470efea6859686558b0a262b10656e7617ef..1f64a6ab76208b2ce1f3a9ba5cd656944a9c8620 100644
--- a/boards/msb-430-common/Makefile
+++ b/boards/msb-430-common/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = drivers
 
diff --git a/boards/msb-430-common/drivers/Makefile b/boards/msb-430-common/drivers/Makefile
index a1a4f9665a4459cb2e4db5f0b7282399d1100614..0d73e725bca630be384101d644c05c952b3101ba 100644
--- a/boards/msb-430-common/drivers/Makefile
+++ b/boards/msb-430-common/drivers/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBOARD)/$(BOARD)/Makefile.include
 
diff --git a/boards/msb-430/Makefile b/boards/msb-430/Makefile
index 4a12edb96978fdc3069f54f1b29729b61b557d20..7746dd4dd9f1579207402398d57c46a142289838 100644
--- a/boards/msb-430/Makefile
+++ b/boards/msb-430/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = $(RIOTBOARD)/msb-430-common
 
diff --git a/boards/msb-430h/Makefile b/boards/msb-430h/Makefile
index 4a12edb96978fdc3069f54f1b29729b61b557d20..7746dd4dd9f1579207402398d57c46a142289838 100644
--- a/boards/msb-430h/Makefile
+++ b/boards/msb-430h/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = $(RIOTBOARD)/msb-430-common
 
diff --git a/boards/msba2-common/Makefile b/boards/msba2-common/Makefile
index 41a2470efea6859686558b0a262b10656e7617ef..1f64a6ab76208b2ce1f3a9ba5cd656944a9c8620 100644
--- a/boards/msba2-common/Makefile
+++ b/boards/msba2-common/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = drivers
 
diff --git a/boards/msba2-common/drivers/Makefile b/boards/msba2-common/drivers/Makefile
index 275a4456b6297213139b1aa5e9545ebb8dd2eb37..6c41c517bd1b2ba9631cb76713bbbba3bc73d2ae 100644
--- a/boards/msba2-common/drivers/Makefile
+++ b/boards/msba2-common/drivers/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 include $(RIOTBOARD)/$(BOARD)/Makefile.include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/msba2/Makefile b/boards/msba2/Makefile
index 5503ec93587990f73c6c9cdfc07365cd3267f7be..5f15bf5c405cc0fd68d21bdd0a68df27ff01872e 100644
--- a/boards/msba2/Makefile
+++ b/boards/msba2/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = $(RIOTBOARD)/msba2-common
 
diff --git a/boards/msbiot/Makefile b/boards/msbiot/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/msbiot/Makefile
+++ b/boards/msbiot/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/mulle/Makefile b/boards/mulle/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/mulle/Makefile
+++ b/boards/mulle/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/native/Makefile b/boards/native/Makefile
index b70aa689d662caa92852b3d6a10b822551a40d06..4bd97629910c663a6d1a61e5589884ffa8c15a74 100644
--- a/boards/native/Makefile
+++ b/boards/native/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = drivers
 
diff --git a/boards/nrf51dongle/Makefile b/boards/nrf51dongle/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/nrf51dongle/Makefile
+++ b/boards/nrf51dongle/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/nrf6310/Makefile b/boards/nrf6310/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/nrf6310/Makefile
+++ b/boards/nrf6310/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/nucleo-f091/Makefile b/boards/nucleo-f091/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/nucleo-f091/Makefile
+++ b/boards/nucleo-f091/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/nucleo-f303/Makefile b/boards/nucleo-f303/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100755
--- a/boards/nucleo-f303/Makefile
+++ b/boards/nucleo-f303/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/nucleo-f334/Makefile b/boards/nucleo-f334/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/nucleo-f334/Makefile
+++ b/boards/nucleo-f334/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/nucleo-f401/Makefile b/boards/nucleo-f401/Makefile
index aa1b315c5d7f9bdc411079eac899d17ea7692a3b..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/nucleo-f401/Makefile
+++ b/boards/nucleo-f401/Makefile
@@ -1,3 +1,3 @@
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/nucleo-l1/Makefile b/boards/nucleo-l1/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/nucleo-l1/Makefile
+++ b/boards/nucleo-l1/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/openmote/Makefile b/boards/openmote/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/openmote/Makefile
+++ b/boards/openmote/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/pba-d-01-kw2x/Makefile b/boards/pba-d-01-kw2x/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/pba-d-01-kw2x/Makefile
+++ b/boards/pba-d-01-kw2x/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/pca10000/Makefile b/boards/pca10000/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/pca10000/Makefile
+++ b/boards/pca10000/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/pca10005/Makefile b/boards/pca10005/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/pca10005/Makefile
+++ b/boards/pca10005/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/pttu/Makefile b/boards/pttu/Makefile
index 5503ec93587990f73c6c9cdfc07365cd3267f7be..5f15bf5c405cc0fd68d21bdd0a68df27ff01872e 100644
--- a/boards/pttu/Makefile
+++ b/boards/pttu/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = $(RIOTBOARD)/msba2-common
 
diff --git a/boards/qemu-i386/Makefile b/boards/qemu-i386/Makefile
index 791a5e61584954aeae561843240f2b65385bffc0..003e3fc6e68b9a5af5f4215e831d35b1e21dfe4b 100644
--- a/boards/qemu-i386/Makefile
+++ b/boards/qemu-i386/Makefile
@@ -1,4 +1,4 @@
-MODULE = qemu-i386_base
+MODULE = board
 
 DIRS = $(RIOTBOARD)/x86-multiboot-common
 
diff --git a/boards/remote/Makefile b/boards/remote/Makefile
index 3333dce58b8beec15963a929543e979df80c2efb..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/remote/Makefile
+++ b/boards/remote/Makefile
@@ -1,4 +1,3 @@
-# Tell the Makefile.base which module to build:
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/saml21-xpro/Makefile b/boards/saml21-xpro/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/saml21-xpro/Makefile
+++ b/boards/saml21-xpro/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/samr21-xpro/Makefile b/boards/samr21-xpro/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/samr21-xpro/Makefile
+++ b/boards/samr21-xpro/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/slwstk6220a/Makefile b/boards/slwstk6220a/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/slwstk6220a/Makefile
+++ b/boards/slwstk6220a/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/spark-core/Makefile b/boards/spark-core/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/spark-core/Makefile
+++ b/boards/spark-core/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/stm32f0discovery/Makefile b/boards/stm32f0discovery/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/stm32f0discovery/Makefile
+++ b/boards/stm32f0discovery/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/stm32f3discovery/Makefile b/boards/stm32f3discovery/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/stm32f3discovery/Makefile
+++ b/boards/stm32f3discovery/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/stm32f4discovery/Makefile b/boards/stm32f4discovery/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/stm32f4discovery/Makefile
+++ b/boards/stm32f4discovery/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/telosb/Makefile b/boards/telosb/Makefile
index ff5489888b2070c3cbaee187beee2113f5d2329c..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/telosb/Makefile
+++ b/boards/telosb/Makefile
@@ -1,3 +1,3 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/udoo/Makefile b/boards/udoo/Makefile
index 2280e8de5069455fbd3fd9c8e9e4ad53eea0e732..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/udoo/Makefile
+++ b/boards/udoo/Makefile
@@ -1,7 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
-
-# add a list of board specific subdirectories that should also be build
-DIRS =
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/weio/Makefile b/boards/weio/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/weio/Makefile
+++ b/boards/weio/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/wsn430-common/Makefile b/boards/wsn430-common/Makefile
index 41a2470efea6859686558b0a262b10656e7617ef..1f64a6ab76208b2ce1f3a9ba5cd656944a9c8620 100644
--- a/boards/wsn430-common/Makefile
+++ b/boards/wsn430-common/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = drivers
 
diff --git a/boards/wsn430-common/drivers/Makefile b/boards/wsn430-common/drivers/Makefile
index a1a4f9665a4459cb2e4db5f0b7282399d1100614..0d73e725bca630be384101d644c05c952b3101ba 100644
--- a/boards/wsn430-common/drivers/Makefile
+++ b/boards/wsn430-common/drivers/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 include $(RIOTBOARD)/$(BOARD)/Makefile.include
 
diff --git a/boards/wsn430-v1_3b/Makefile b/boards/wsn430-v1_3b/Makefile
index 5e88812e16ca079e3e5f1b0c933d4762cfdfe361..c28e0e33e316400d0b441576b6e22bbc2caeaea5 100644
--- a/boards/wsn430-v1_3b/Makefile
+++ b/boards/wsn430-v1_3b/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = board
 
 DIRS = $(RIOTBOARD)/wsn430-common
 
diff --git a/boards/wsn430-v1_4/Makefile b/boards/wsn430-v1_4/Makefile
index f41b2a86346d4fce8f1ea490f59052bb7be0b6af..c28e0e33e316400d0b441576b6e22bbc2caeaea5 100644
--- a/boards/wsn430-v1_4/Makefile
+++ b/boards/wsn430-v1_4/Makefile
@@ -1,4 +1,4 @@
-MODULE = $(BOARD)_base
+MODULE = board
 
 DIRS = $(RIOTBOARD)/wsn430-common
 
diff --git a/boards/x86-multiboot-common/Makefile b/boards/x86-multiboot-common/Makefile
index dee7269a507ec880606a3ffbdc7eae741eec3b70..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/x86-multiboot-common/Makefile
+++ b/boards/x86-multiboot-common/Makefile
@@ -1,3 +1,3 @@
-MODULE = x86-multiboot-common_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/x86-multiboot-common/Makefile.include b/boards/x86-multiboot-common/Makefile.include
index 71641ff3c8ce2c35c599234633c3be2de3f7f7fd..46cb72f8335ff62bd3f591c7df9ad05301454d3f 100644
--- a/boards/x86-multiboot-common/Makefile.include
+++ b/boards/x86-multiboot-common/Makefile.include
@@ -46,7 +46,7 @@ LINKFLAGS += -m32 -nostdlib -nostdinc -nostartfiles -nodefaultlibs \
              --prefix=$(NEWLIB_BASE) \
              -Wl,-rpath,$(NEWLIB_BASE)/lib \
              -T$(RIOTBASE)/boards/x86-multiboot-common/linker.ld
-UNDEF += $(BINDIR)x86-multiboot-common_base/startup.o
+UNDEF += $(BINDIR)board/startup.o
 
 BASELIBS += $(NEWLIB_BASE)/lib/libc.a \
             $(NEWLIB_BASE)/lib/libm.a
diff --git a/boards/yunjia-nrf51822/Makefile b/boards/yunjia-nrf51822/Makefile
index 37891de8e6a2c369f1f81f7d875d257d482fe0ca..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/yunjia-nrf51822/Makefile
+++ b/boards/yunjia-nrf51822/Makefile
@@ -1,4 +1,3 @@
-# tell the Makefile.base which module to build
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/z1/Makefile b/boards/z1/Makefile
index aa1b315c5d7f9bdc411079eac899d17ea7692a3b..f8fcbb53a06595771dae356338a7bf2c0673734d 100644
--- a/boards/z1/Makefile
+++ b/boards/z1/Makefile
@@ -1,3 +1,3 @@
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base