diff --git a/Makefile.include b/Makefile.include
index 39cedd7f291e57287b03dfbf1b3a0d4d833e0275..750cad7bce013fa5e507bb0c66a427dd9767d16e 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -426,6 +426,6 @@ endif
help:
@$(MAKE) -qp | sed -ne 's/\(^[a-z][a-z_-]*\):.*/\1/p' | sort | uniq
-ifneq (,$(filter iot-lab_M3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
+ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab
endif
diff --git a/boards/iot-lab_M3/Makefile b/boards/iotlab-m3/Makefile
similarity index 100%
rename from boards/iot-lab_M3/Makefile
rename to boards/iotlab-m3/Makefile
diff --git a/boards/iot-lab_M3/Makefile.dep b/boards/iotlab-m3/Makefile.dep
similarity index 100%
rename from boards/iot-lab_M3/Makefile.dep
rename to boards/iotlab-m3/Makefile.dep
diff --git a/boards/iot-lab_M3/Makefile.features b/boards/iotlab-m3/Makefile.features
similarity index 100%
rename from boards/iot-lab_M3/Makefile.features
rename to boards/iotlab-m3/Makefile.features
diff --git a/boards/iot-lab_M3/Makefile.include b/boards/iotlab-m3/Makefile.include
similarity index 100%
rename from boards/iot-lab_M3/Makefile.include
rename to boards/iotlab-m3/Makefile.include
diff --git a/boards/iot-lab_M3/board.c b/boards/iotlab-m3/board.c
similarity index 91%
rename from boards/iot-lab_M3/board.c
rename to boards/iotlab-m3/board.c
index 2d4338e27e6501c5ae671f17d4aba72e3d3a227f..e9b6bc7d02688c25416dd7d6c95d1534e8edb855 100644
--- a/boards/iot-lab_M3/board.c
+++ b/boards/iotlab-m3/board.c
@@ -7,11 +7,11 @@
*/
/**
- * @ingroup boards_iot-lab_M3
+ * @ingroup boards_iotlab-m3
* @{
*
* @file
- * @brief Board specific implementations for the iot-lab_M3 board
+ * @brief Board specific implementations for the iotlab-m3 board
*
* @author Thomas Eichinger <thomas.eichinger@fu-berlin.de>
*
diff --git a/boards/iot-lab_M3/dist/openocd.cfg b/boards/iotlab-m3/dist/openocd.cfg
similarity index 100%
rename from boards/iot-lab_M3/dist/openocd.cfg
rename to boards/iotlab-m3/dist/openocd.cfg
diff --git a/boards/iot-lab_M3/include/at86rf2xx_params.h b/boards/iotlab-m3/include/at86rf2xx_params.h
similarity index 96%
rename from boards/iot-lab_M3/include/at86rf2xx_params.h
rename to boards/iotlab-m3/include/at86rf2xx_params.h
index 559c9b6f9ec693a6a9fc84c174e928222729992e..55f272773a91ae832f823667897907b20f4245dd 100644
--- a/boards/iot-lab_M3/include/at86rf2xx_params.h
+++ b/boards/iotlab-m3/include/at86rf2xx_params.h
@@ -7,7 +7,7 @@
*/
/**
- * @ingroup board_iot-lab_M3
+ * @ingroup board_iotlab-m3
* @{
*
* @file
diff --git a/boards/iot-lab_M3/include/board.h b/boards/iotlab-m3/include/board.h
similarity index 95%
rename from boards/iot-lab_M3/include/board.h
rename to boards/iotlab-m3/include/board.h
index c4db1244bd1917b3e9ec3e698852abf2e2b4fcfa..59130181e53c76e796071aee25dfc2f87c3f9c4c 100644
--- a/boards/iot-lab_M3/include/board.h
+++ b/boards/iotlab-m3/include/board.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_iot-lab_M3 IoT-LAB M3 open node
+ * @defgroup boards_iotlab-m3 IoT-LAB M3 open node
* @ingroup boards
- * @brief Board specific files for the iot-lab_M3 board.
+ * @brief Board specific files for the iotlab-m3 board.
* @{
*
* @file
- * @brief Board specific definitions for the iot-lab_M3 board.
+ * @brief Board specific definitions for the iotlab-m3 board.
*
* @author Alaeddine Weslati <alaeddine.weslati@inria.fr>
* @author Thomas Eichinger <thomas.eichinger@fu-berlin.de>
diff --git a/boards/iot-lab_M3/include/periph_conf.h b/boards/iotlab-m3/include/periph_conf.h
similarity index 98%
rename from boards/iot-lab_M3/include/periph_conf.h
rename to boards/iotlab-m3/include/periph_conf.h
index e2e5b0b38fd6e5038d75add3c31ecb8cb79f17a9..cfd89054ec43b134b005d55d4225c420989e4ebf 100644
--- a/boards/iot-lab_M3/include/periph_conf.h
+++ b/boards/iotlab-m3/include/periph_conf.h
@@ -7,11 +7,11 @@
*/
/**
- * @ingroup boards_iot-lab_M3
+ * @ingroup boards_iotlab-m3
* @{
*
* @file
- * @brief Peripheral MCU configuration for the iot-lab_M3 board
+ * @brief Peripheral MCU configuration for the iotlab-m3 board
*
* @author Thomas Eichinger <thomas.eichinger@fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
diff --git a/dist/tools/sniffer/README.md b/dist/tools/sniffer/README.md
index 1d65dda2979bc519d34c3445496e8e78c5ebaa4f..cc99e25bc503dd1ce8234630a7fbba4f20a0efff 100644
--- a/dist/tools/sniffer/README.md
+++ b/dist/tools/sniffer/README.md
@@ -62,7 +62,7 @@ The script has the following parameters:
### Examples
The following examples are made when using the sniffer application together with
-an `iot-lab_M3` node that is connected to /dev/ttyUSB1 (or COM1) and runs per
+an `iotlab-m3` node that is connected to /dev/ttyUSB1 (or COM1) and runs per
default with a baudrate of 500000.
#### Linux
diff --git a/examples/default/Makefile b/examples/default/Makefile
index 3e18616a0941ee201df3e22e422a4cfe6a626887..4a6fd8ee64c0bb22a9809f257c7fc74c189e6b51 100644
--- a/examples/default/Makefile
+++ b/examples/default/Makefile
@@ -47,7 +47,7 @@ ifneq (,$(filter msba2,$(BOARD)))
USEMODULE += mci
USEMODULE += random
endif
-ifneq (,$(filter iot-lab_M3,$(BOARD)))
+ifneq (,$(filter iotlab-m3,$(BOARD)))
USEMODULE += isl29020
USEMODULE += lps331ap
USEMODULE += l3g4200d
diff --git a/pkg/openwsn/README.md b/pkg/openwsn/README.md
index ab7d46104513ec6a282818c9947ffe3ed84fce92..60c230ecc5f75597d2c276f5297f5210cfcd0710 100644
--- a/pkg/openwsn/README.md
+++ b/pkg/openwsn/README.md
@@ -1,7 +1,7 @@
# OpenWSN on RIOT
This port of OpenWSN to RIOT is based on current OpenWSN upstream providing a
-BSP with RIOT's interfaces. Currently supported are iot-lab_M3 and fox. More
+BSP with RIOT's interfaces. Currently supported are iotlab-m3 and fox. More
boards will follow through improvements in netdev radio driver interface.
# Usage
@@ -11,7 +11,7 @@ as root or listening node. And providing a sample Makefile.
Build using
```Bash
-$> export BOARD=iot-lab_M3
+$> export BOARD=iotlab-m3
$> export PORT=/dev/ttyTHEPORTOFYOURIOTLAB
$> make -B clean flash term
```
diff --git a/release-notes.txt b/release-notes.txt
index 24ff84989bb45ccd1c686ed38e585bb42b8f1df0..8ceb6d1105c2daafbfdf4a867e98352b9a6b9b2c 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -87,7 +87,7 @@ Core
Supported platforms
-------------------
-* improved iot-lab_M3 support
+* improved iotlab-m3 support
* major improvements on the mbed LPC1768
* improved at86rf231 radio driver
* fixed hwtimer for MSP430
diff --git a/tests/driver_at86rf2xx/Makefile b/tests/driver_at86rf2xx/Makefile
index eb93aff41015d35bba883508c4ca8ffc586b4563..4ef0b1b6f773b8ae61e208df1e8d03ac655a8767 100644
--- a/tests/driver_at86rf2xx/Makefile
+++ b/tests/driver_at86rf2xx/Makefile
@@ -11,7 +11,7 @@ ifneq (,$(filter samr21-xpro,$(BOARD)))
DRIVER ?= at86rf233
USE_BOARD_PARAMETERS:=true
endif
-ifneq (,$(filter iot-lab_M3,$(BOARD)))
+ifneq (,$(filter iotlab-m3,$(BOARD)))
DRIVER ?= at86rf231
USE_BOARD_PARAMETERS:=true
endif
diff --git a/tests/driver_isl29020/Makefile b/tests/driver_isl29020/Makefile
index 2dd0aadc5f2630fb2b3f5abf4981c42aba257736..989872cf97cc737cb262fa70e7e0a5366e94e0d4 100644
--- a/tests/driver_isl29020/Makefile
+++ b/tests/driver_isl29020/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.tests_common
FEATURES_REQUIRED = periph_i2c
# Define default pin mappings for some boards:
-ifneq (,$(filter iot-lab_M3,$(BOARD)))
+ifneq (,$(filter iotlab-m3,$(BOARD)))
export TEST_ISL29020_ADDR = 68
export TEST_ISL29020_I2C ?= I2C_0
endif
diff --git a/tests/driver_lsm303dlhc/Makefile b/tests/driver_lsm303dlhc/Makefile
index 6f954b2b4e0a4a6d9f0003fef916befa64a4bbec..347912db73d6434d1061d2ad1050eafdc1158083 100644
--- a/tests/driver_lsm303dlhc/Makefile
+++ b/tests/driver_lsm303dlhc/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.tests_common
FEATURES_REQUIRED = periph_i2c
# Define default pin mappings for some boards:
-ifneq (,$(filter iot-lab_M3,$(BOARD)))
+ifneq (,$(filter iotlab-m3,$(BOARD)))
export TEST_LSM303DLHC_MAG_ADDR=30
export TEST_LSM303DLHC_ACC_ADDR=25
export TEST_LSM303DLHC_I2C ?=I2C_0
diff --git a/tests/pkg_cmsis-dsp/Makefile b/tests/pkg_cmsis-dsp/Makefile
index 93cc53d94e6db560661c57e6eed768322eb773ab..8620ed988c7eca386a5557edfca065f2162b4bcd 100644
--- a/tests/pkg_cmsis-dsp/Makefile
+++ b/tests/pkg_cmsis-dsp/Makefile
@@ -9,7 +9,7 @@ BOARD_WHITELIST := \
cc2538dk \
f4vi1 \
fox \
- iot-lab_M3 \
+ iotlab-m3 \
mbed_lpc1768 \
msbiot \
mulle \