diff --git a/boards/opencm9-04/Makefile b/boards/opencm904/Makefile
similarity index 100%
rename from boards/opencm9-04/Makefile
rename to boards/opencm904/Makefile
diff --git a/boards/opencm9-04/Makefile.features b/boards/opencm904/Makefile.features
similarity index 100%
rename from boards/opencm9-04/Makefile.features
rename to boards/opencm904/Makefile.features
diff --git a/boards/opencm9-04/Makefile.include b/boards/opencm904/Makefile.include
similarity index 92%
rename from boards/opencm9-04/Makefile.include
rename to boards/opencm904/Makefile.include
index 49dd53ef4d4d2cd293b92094947060325b59f359..4c1dfda5de64937bd9860c9ad906ee5967d9e985 100755
--- a/boards/opencm9-04/Makefile.include
+++ b/boards/opencm904/Makefile.include
@@ -3,7 +3,7 @@ export CPU = stm32f1
 export CPU_MODEL = stm32f103cb
 
 # custom linkerscript
-export LINKER_SCRIPT = stm32f103cb_opencm9-04.ld
+export LINKER_SCRIPT = stm32f103cb_opencm904.ld
 
 # custom flasher to use with the bootloader
 export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/robotis-loader.py
diff --git a/boards/opencm9-04/board.c b/boards/opencm904/board.c
similarity index 96%
rename from boards/opencm9-04/board.c
rename to boards/opencm904/board.c
index 4c049ffee91bfccf3a9325abb8fbdacb78ac08ba..f6d2c741c73eb2cd73e7c545b6d6479f6913bf17 100644
--- a/boards/opencm9-04/board.c
+++ b/boards/opencm904/board.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_opencm9-04
+ * @ingroup     boards_opencm904
  * @{
  *
  * @file
diff --git a/boards/opencm9-04/dist/robotis-loader.py b/boards/opencm904/dist/robotis-loader.py
similarity index 100%
rename from boards/opencm9-04/dist/robotis-loader.py
rename to boards/opencm904/dist/robotis-loader.py
diff --git a/boards/opencm9-04/include/board.h b/boards/opencm904/include/board.h
similarity index 97%
rename from boards/opencm9-04/include/board.h
rename to boards/opencm904/include/board.h
index ee419d6134f3fb495e561e7628925435b9ffae5e..3fab40867bf3d5c3775c445f41cdc9e87d3b25bd 100755
--- a/boards/opencm9-04/include/board.h
+++ b/boards/opencm904/include/board.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @defgroup    boards_opencm9-04 OpenCM9.04
+ * @defgroup    boards_opencm904 OpenCM9.04
  * @ingroup     boards
  * @brief       Board specific files for the OpenCM9.04 board
  * @{
diff --git a/boards/opencm9-04/include/periph_conf.h b/boards/opencm904/include/periph_conf.h
similarity index 96%
rename from boards/opencm9-04/include/periph_conf.h
rename to boards/opencm904/include/periph_conf.h
index 0bdc9bccd748ec830ea56c6141c5fc3faf9cb661..6d8fc5ebe11fdddb54f1c6f6f9b67e9f9894fb1a 100644
--- a/boards/opencm9-04/include/periph_conf.h
+++ b/boards/opencm904/include/periph_conf.h
@@ -7,11 +7,11 @@
  */
 
 /**
- * @ingroup     boards_opencm9-04
+ * @ingroup     boards_opencm904
  * @{
  *
  * @file
- * @brief       Peripheral MCU configuration for the opencm9-04 board
+ * @brief       Peripheral MCU configuration for the opencm904 board
  *
  * @author      Loïc Dauphin <loic.dauphin@inria.fr>
  */