diff --git a/boards/openmote/Makefile b/boards/openmote-cc2538/Makefile
similarity index 100%
rename from boards/openmote/Makefile
rename to boards/openmote-cc2538/Makefile
diff --git a/boards/openmote/Makefile.features b/boards/openmote-cc2538/Makefile.features
similarity index 100%
rename from boards/openmote/Makefile.features
rename to boards/openmote-cc2538/Makefile.features
diff --git a/boards/openmote/Makefile.include b/boards/openmote-cc2538/Makefile.include
similarity index 93%
rename from boards/openmote/Makefile.include
rename to boards/openmote-cc2538/Makefile.include
index b2bc93745e..faf17d41e8 100644
--- a/boards/openmote/Makefile.include
+++ b/boards/openmote-cc2538/Makefile.include
@@ -1,4 +1,4 @@
-# define the cpu used by the OpenMote board
+# define the cpu used by the OpenMote-cc2538 board
 export CPU = cc2538
 export CPU_MODEL = cc2538sf53
 
diff --git a/boards/openmote/board.c b/boards/openmote-cc2538/board.c
similarity index 92%
rename from boards/openmote/board.c
rename to boards/openmote-cc2538/board.c
index a106c1a114..3f881c22be 100644
--- a/boards/openmote/board.c
+++ b/boards/openmote-cc2538/board.c
@@ -7,11 +7,11 @@
  */
 
 /**
- * @ingroup     boards_openmote
+ * @ingroup     boards_openmote-cc2538
  * @{
  *
  * @file
- * @brief       Board specific implementations for the OpenMote board
+ * @brief       Board specific implementations for the OpenMote-cc2538 board
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  *
diff --git a/boards/openmote/dist/debug.sh b/boards/openmote-cc2538/dist/debug.sh
similarity index 100%
rename from boards/openmote/dist/debug.sh
rename to boards/openmote-cc2538/dist/debug.sh
diff --git a/boards/openmote/dist/flash.sh b/boards/openmote-cc2538/dist/flash.sh
similarity index 100%
rename from boards/openmote/dist/flash.sh
rename to boards/openmote-cc2538/dist/flash.sh
diff --git a/boards/openmote/dist/reset.sh b/boards/openmote-cc2538/dist/reset.sh
similarity index 100%
rename from boards/openmote/dist/reset.sh
rename to boards/openmote-cc2538/dist/reset.sh
diff --git a/boards/openmote/include/board.h b/boards/openmote-cc2538/include/board.h
similarity index 91%
rename from boards/openmote/include/board.h
rename to boards/openmote-cc2538/include/board.h
index 1ca4aab838..99c6b0f5b5 100644
--- a/boards/openmote/include/board.h
+++ b/boards/openmote-cc2538/include/board.h
@@ -7,13 +7,13 @@
  */
 
 /**
- * @defgroup    boards_openmote OpenMote
+ * @defgroup    boards_openmote-cc2538 OpenMote-cc2538
  * @ingroup     boards
- * @brief       Support for the OpenMote board
+ * @brief       Support for the OpenMote-cc2538 board
  * @{
  *
  * @file
- * @brief       Board specific definitions for the OpenMote board
+ * @brief       Board specific definitions for the OpenMote-cc2538 board
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
diff --git a/boards/openmote/include/periph_conf.h b/boards/openmote-cc2538/include/periph_conf.h
similarity index 97%
rename from boards/openmote/include/periph_conf.h
rename to boards/openmote-cc2538/include/periph_conf.h
index f77c45e889..afb097a9e2 100644
--- a/boards/openmote/include/periph_conf.h
+++ b/boards/openmote-cc2538/include/periph_conf.h
@@ -7,11 +7,11 @@
  */
 
 /**
- * @ingroup     boards_openmote
+ * @ingroup     boards_openmote-cc2538
  * @{
  *
  * @file
- * @brief       Peripheral MCU configuration for the OpenMote board
+ * @brief       Peripheral MCU configuration for the OpenMote-cc2538 board
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
diff --git a/tests/pkg_cmsis-dsp/Makefile b/tests/pkg_cmsis-dsp/Makefile
index 7bc2d0145f..83d8e671f4 100644
--- a/tests/pkg_cmsis-dsp/Makefile
+++ b/tests/pkg_cmsis-dsp/Makefile
@@ -19,7 +19,7 @@ BOARD_WHITELIST := \
   nucleo-f334 \
   nucleo-f401 \
   nucleo-l1 \
-  openmote \
+  openmote-cc2538 \
   pba-d-01-kw2x \
   pca10000 \
   pca10005 \
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index 08e14df4fa..f3f31dc5c2 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -20,7 +20,7 @@ DISABLE_TEST_FOR_ARM7 := tests-relic
 
 ARM_CORTEX_M_BOARDS := airfy-beacon arduino-due cc2538dk ek-lm4f120xl f4vi1 fox frdm-k64f \
                        iotlab-m3 limifrog-v1 mbed_lpc1768 msbiot mulle nrf51dongle nrf6310 \
-                       nucleo-f091 nucleo-f303 nucleo-f334 nucleo-f401 nucleo-l1 openmote \
+                       nucleo-f091 nucleo-f303 nucleo-f334 nucleo-f401 nucleo-l1 openmote-cc2538 \
                        pba-d-01-kw2x pca10000 pca10005 remote saml21-xpro samr21-xpro slwstk6220a \
                        spark-core stm32f0discovery stm32f3discovery stm32f4discovery udoo weio \
                        yunjia-nrf51822