diff --git a/demos/ARMCM3-STM32F107-GCC/Makefile b/demos/ARMCM3-STM32F107/Makefile
similarity index 100%
rename from demos/ARMCM3-STM32F107-GCC/Makefile
rename to demos/ARMCM3-STM32F107/Makefile
diff --git a/demos/ARMCM3-STM32F107-GCC/ch.ld b/demos/ARMCM3-STM32F107/ch.ld
similarity index 100%
rename from demos/ARMCM3-STM32F107-GCC/ch.ld
rename to demos/ARMCM3-STM32F107/ch.ld
diff --git a/demos/ARMCM3-STM32F107-GCC/chconf.h b/demos/ARMCM3-STM32F107/chconf.h
similarity index 100%
rename from demos/ARMCM3-STM32F107-GCC/chconf.h
rename to demos/ARMCM3-STM32F107/chconf.h
diff --git a/demos/ARMCM3-STM32F107-GCC/halconf.h b/demos/ARMCM3-STM32F107/halconf.h
similarity index 100%
rename from demos/ARMCM3-STM32F107-GCC/halconf.h
rename to demos/ARMCM3-STM32F107/halconf.h
diff --git a/demos/ARMCM3-STM32F107-GCC/main.c b/demos/ARMCM3-STM32F107/main.c
similarity index 100%
rename from demos/ARMCM3-STM32F107-GCC/main.c
rename to demos/ARMCM3-STM32F107/main.c
diff --git a/demos/ARMCM3-STM32F107-GCC/mcuconf.h b/demos/ARMCM3-STM32F107/mcuconf.h
similarity index 100%
rename from demos/ARMCM3-STM32F107-GCC/mcuconf.h
rename to demos/ARMCM3-STM32F107/mcuconf.h
diff --git a/demos/ARMCM3-STM32F107-GCC/readme.txt b/demos/ARMCM3-STM32F107/readme.txt
similarity index 100%
rename from demos/ARMCM3-STM32F107-GCC/readme.txt
rename to demos/ARMCM3-STM32F107/readme.txt
diff --git a/readme.txt b/readme.txt
index ddf0b0ceb..540a66d9e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -77,8 +77,9 @@
 - NEW: Improved setup packets handling in the USB driver through a specific
   callback.
 - OPT: Simplified Serial over USB driver configuration.
-- CHANGE: Now the STM32F107 demo targets the board Olimex STM32-P107 as
-  default.
+- CHANGE: Renamed the demo ARMCM3-STM32F107-GCC in ARMCM3-STM32F107.
+- CHANGE: Now the ARMCM3-STM32F107 demo targets the board Olimex STM32-P107
+  as default.
 - CHANGE: Removed all the prefixes from the structure/union field names
   in the HAL subsystem.