From ac2b9f2524b5c9ea632bc5a1c07ecf018d19c5d6 Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Wed, 2 Dec 2015 10:39:51 +0100
Subject: [PATCH] boards: changed module name to 'board'

---
 boards/airfy-beacon/Makefile                 | 3 +--
 boards/arduino-due/Makefile                  | 7 +------
 boards/arduino-mega2560/Makefile             | 2 +-
 boards/avsextrem/Makefile                    | 2 +-
 boards/avsextrem/drivers/Makefile            | 2 +-
 boards/cc2538dk/Makefile                     | 3 +--
 boards/chronos/Makefile                      | 2 +-
 boards/chronos/drivers/Makefile              | 2 +-
 boards/ek-lm4f120xl/Makefile                 | 3 +--
 boards/f4vi1/Makefile                        | 3 +--
 boards/fox/Makefile                          | 2 +-
 boards/frdm-k64f/Makefile                    | 3 +--
 boards/iotlab-m3/Makefile                    | 2 +-
 boards/limifrog-v1/Makefile                  | 2 +-
 boards/mbed_lpc1768/Makefile                 | 3 +--
 boards/msb-430-common/Makefile               | 2 +-
 boards/msb-430-common/drivers/Makefile       | 2 +-
 boards/msb-430/Makefile                      | 2 +-
 boards/msb-430h/Makefile                     | 2 +-
 boards/msba2-common/Makefile                 | 2 +-
 boards/msba2-common/drivers/Makefile         | 2 +-
 boards/msba2/Makefile                        | 2 +-
 boards/msbiot/Makefile                       | 3 +--
 boards/mulle/Makefile                        | 3 +--
 boards/native/Makefile                       | 2 +-
 boards/nrf51dongle/Makefile                  | 3 +--
 boards/nrf6310/Makefile                      | 3 +--
 boards/nucleo-f091/Makefile                  | 2 +-
 boards/nucleo-f303/Makefile                  | 2 +-
 boards/nucleo-f334/Makefile                  | 2 +-
 boards/nucleo-f401/Makefile                  | 2 +-
 boards/nucleo-l1/Makefile                    | 2 +-
 boards/openmote/Makefile                     | 3 +--
 boards/pba-d-01-kw2x/Makefile                | 3 +--
 boards/pca10000/Makefile                     | 3 +--
 boards/pca10005/Makefile                     | 3 +--
 boards/pttu/Makefile                         | 2 +-
 boards/qemu-i386/Makefile                    | 2 +-
 boards/remote/Makefile                       | 3 +--
 boards/saml21-xpro/Makefile                  | 3 +--
 boards/samr21-xpro/Makefile                  | 3 +--
 boards/slwstk6220a/Makefile                  | 3 +--
 boards/spark-core/Makefile                   | 2 +-
 boards/stm32f0discovery/Makefile             | 3 +--
 boards/stm32f3discovery/Makefile             | 3 +--
 boards/stm32f4discovery/Makefile             | 3 +--
 boards/telosb/Makefile                       | 2 +-
 boards/udoo/Makefile                         | 6 +-----
 boards/weio/Makefile                         | 3 +--
 boards/wsn430-common/Makefile                | 2 +-
 boards/wsn430-common/drivers/Makefile        | 2 +-
 boards/wsn430-v1_3b/Makefile                 | 2 +-
 boards/wsn430-v1_4/Makefile                  | 2 +-
 boards/x86-multiboot-common/Makefile         | 2 +-
 boards/x86-multiboot-common/Makefile.include | 2 +-
 boards/yunjia-nrf51822/Makefile              | 3 +--
 boards/z1/Makefile                           | 2 +-
 57 files changed, 57 insertions(+), 89 deletions(-)

diff --git a/boards/airfy-beacon/Makefile b/boards/airfy-beacon/Makefile
index 37891de8e6..f8fcbb53a0 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 9853e690f5..f8fcbb53a0 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 aa1b315c5d..f8fcbb53a0 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 60612c88c8..adadebde0d 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 261c3e5265..6c41c517bd 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 3333dce58b..f8fcbb53a0 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 17c1af8c7c..2c34df4626 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 ff5489888b..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 41a2470efe..1f64a6ab76 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 a1a4f9665a..0d73e725bc 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 4a12edb969..7746dd4dd9 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 4a12edb969..7746dd4dd9 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 41a2470efe..1f64a6ab76 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 275a4456b6..6c41c517bd 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 5503ec9358..5f15bf5c40 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 b70aa689d6..4bd9762991 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 aa1b315c5d..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 5503ec9358..5f15bf5c40 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 791a5e6158..003e3fc6e6 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 3333dce58b..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 ff5489888b..f8fcbb53a0 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 2280e8de50..f8fcbb53a0 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 37891de8e6..f8fcbb53a0 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 41a2470efe..1f64a6ab76 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 a1a4f9665a..0d73e725bc 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 5e88812e16..c28e0e33e3 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 f41b2a8634..c28e0e33e3 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 dee7269a50..f8fcbb53a0 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 71641ff3c8..46cb72f833 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 37891de8e6..f8fcbb53a0 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 aa1b315c5d..f8fcbb53a0 100644
--- a/boards/z1/Makefile
+++ b/boards/z1/Makefile
@@ -1,3 +1,3 @@
-MODULE = $(BOARD)_base
+MODULE = board
 
 include $(RIOTBASE)/Makefile.base
-- 
GitLab