diff --git a/include/stm32/adc.h b/include/stm32/adc.h
index e3bdffc7..c3a34cf1 100644
--- a/include/stm32/adc.h
+++ b/include/stm32/adc.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_ADC_H
-#define LIBOPENSTM32_ADC_H
+#ifndef LIBOPENCM3_ADC_H
+#define LIBOPENCM3_ADC_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/bkp.h b/include/stm32/bkp.h
index dc091a5b..d782141e 100644
--- a/include/stm32/bkp.h
+++ b/include/stm32/bkp.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_BKP_H
-#define LIBOPENSTM32_BKP_H
+#ifndef LIBOPENCM3_BKP_H
+#define LIBOPENCM3_BKP_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/can.h b/include/stm32/can.h
index c2b11c17..e48f336a 100644
--- a/include/stm32/can.h
+++ b/include/stm32/can.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_CAN_H
-#define LIBOPENSTM32_CAN_H
+#ifndef LIBOPENCM3_CAN_H
+#define LIBOPENCM3_CAN_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/crc.h b/include/stm32/crc.h
index a7ea1390..46644a1a 100644
--- a/include/stm32/crc.h
+++ b/include/stm32/crc.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_CRC_H
-#define LIBOPENSTM32_CRC_H
+#ifndef LIBOPENCM3_CRC_H
+#define LIBOPENCM3_CRC_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/dma.h b/include/stm32/dma.h
index ef8ef616..d82dc650 100644
--- a/include/stm32/dma.h
+++ b/include/stm32/dma.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_DMA_H
-#define LIBOPENSTM32_DMA_H
+#ifndef LIBOPENCM3_DMA_H
+#define LIBOPENCM3_DMA_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/ethernet.h b/include/stm32/ethernet.h
index 48d87b0c..f331278e 100644
--- a/include/stm32/ethernet.h
+++ b/include/stm32/ethernet.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_ETHERNET_H
-#define LIBOPENSTM32_ETHERNET_H
+#ifndef LIBOPENCM3_ETHERNET_H
+#define LIBOPENCM3_ETHERNET_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/exti.h b/include/stm32/exti.h
index dbf0eab1..a0e3eb26 100644
--- a/include/stm32/exti.h
+++ b/include/stm32/exti.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_EXTI_H
-#define LIBOPENSTM32_EXTI_H
+#ifndef LIBOPENCM3_EXTI_H
+#define LIBOPENCM3_EXTI_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/flash.h b/include/stm32/flash.h
index 8bd879bc..31ae1ee6 100644
--- a/include/stm32/flash.h
+++ b/include/stm32/flash.h
@@ -25,8 +25,8 @@
  * http://www.st.com/stonline/products/literature/pm/13259.pdf
  */
 
-#ifndef LIBOPENSTM32_FLASH_H
-#define LIBOPENSTM32_FLASH_H
+#ifndef LIBOPENCM3_FLASH_H
+#define LIBOPENCM3_FLASH_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/fsmc.h b/include/stm32/fsmc.h
index 0d6455c8..545de97d 100644
--- a/include/stm32/fsmc.h
+++ b/include/stm32/fsmc.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_FSMC_H
-#define LIBOPENSTM32_FSMC_H
+#ifndef LIBOPENCM3_FSMC_H
+#define LIBOPENCM3_FSMC_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/gpio.h b/include/stm32/gpio.h
index 99f6839f..0febee00 100644
--- a/include/stm32/gpio.h
+++ b/include/stm32/gpio.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_GPIO_H
-#define LIBOPENSTM32_GPIO_H
+#ifndef LIBOPENCM3_GPIO_H
+#define LIBOPENCM3_GPIO_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/i2c.h b/include/stm32/i2c.h
index 75081ead..e02eb904 100644
--- a/include/stm32/i2c.h
+++ b/include/stm32/i2c.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_I2C_H
-#define LIBOPENSTM32_I2C_H
+#ifndef LIBOPENCM3_I2C_H
+#define LIBOPENCM3_I2C_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/iwdg.h b/include/stm32/iwdg.h
index cdd501c3..1162c349 100644
--- a/include/stm32/iwdg.h
+++ b/include/stm32/iwdg.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_IWDG_H
-#define LIBOPENSTM32_IWDG_H
+#ifndef LIBOPENCM3_IWDG_H
+#define LIBOPENCM3_IWDG_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/memorymap.h b/include/stm32/memorymap.h
index db5daad3..db3677b8 100644
--- a/include/stm32/memorymap.h
+++ b/include/stm32/memorymap.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_MEMORYMAP_H
-#define LIBOPENSTM32_MEMORYMAP_H
+#ifndef LIBOPENCM3_MEMORYMAP_H
+#define LIBOPENCM3_MEMORYMAP_H
 
 #include <cm3/memorymap.h>
 
diff --git a/include/stm32/nvic.h b/include/stm32/nvic.h
index 3a2cda4a..23dab7d2 100644
--- a/include/stm32/nvic.h
+++ b/include/stm32/nvic.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_NVIC_H
-#define LIBOPENSTM32_NVIC_H
+#ifndef LIBOPENCM3_NVIC_H
+#define LIBOPENCM3_NVIC_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/pwr.h b/include/stm32/pwr.h
index 241a05c7..9be68eff 100644
--- a/include/stm32/pwr.h
+++ b/include/stm32/pwr.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_PWR_H
-#define LIBOPENSTM32_PWR_H
+#ifndef LIBOPENCM3_PWR_H
+#define LIBOPENCM3_PWR_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/rcc.h b/include/stm32/rcc.h
index 11cd9292..81cd50d0 100644
--- a/include/stm32/rcc.h
+++ b/include/stm32/rcc.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_RCC_H
-#define LIBOPENSTM32_RCC_H
+#ifndef LIBOPENCM3_RCC_H
+#define LIBOPENCM3_RCC_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/rtc.h b/include/stm32/rtc.h
index b52669b6..dad9f95b 100644
--- a/include/stm32/rtc.h
+++ b/include/stm32/rtc.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_RTC_H
-#define LIBOPENSTM32_RTC_H
+#ifndef LIBOPENCM3_RTC_H
+#define LIBOPENCM3_RTC_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/scb.h b/include/stm32/scb.h
index 804f1138..42f5588f 100644
--- a/include/stm32/scb.h
+++ b/include/stm32/scb.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_SCB_H
-#define LIBOPENSTM32_SCB_H
+#ifndef LIBOPENCM3_SCB_H
+#define LIBOPENCM3_SCB_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/spi.h b/include/stm32/spi.h
index 96aa810f..8efccc8f 100644
--- a/include/stm32/spi.h
+++ b/include/stm32/spi.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_SPI_H
-#define LIBOPENSTM32_SPI_H
+#ifndef LIBOPENCM3_SPI_H
+#define LIBOPENCM3_SPI_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/systick.h b/include/stm32/systick.h
index 85f43a7e..094db693 100644
--- a/include/stm32/systick.h
+++ b/include/stm32/systick.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_SYSTICK_H
-#define LIBOPENSTM32_SYSTICK_H
+#ifndef LIBOPENCM3_SYSTICK_H
+#define LIBOPENCM3_SYSTICK_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/timer.h b/include/stm32/timer.h
index 4e2d6423..ed5a693a 100644
--- a/include/stm32/timer.h
+++ b/include/stm32/timer.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_TIMER_H
-#define LIBOPENSTM32_TIMER_H
+#ifndef LIBOPENCM3_TIMER_H
+#define LIBOPENCM3_TIMER_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/tools.h b/include/stm32/tools.h
index 5ce7944b..ac7f0bf7 100644
--- a/include/stm32/tools.h
+++ b/include/stm32/tools.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_TOOLS_H
-#define LIBOPENSTM32_TOOLS_H
+#ifndef LIBOPENCM3_TOOLS_H
+#define LIBOPENCM3_TOOLS_H
 
 /*
  * Register accessors / manipulators
diff --git a/include/stm32/usart.h b/include/stm32/usart.h
index 7fa9f2f0..e1c3b0de 100644
--- a/include/stm32/usart.h
+++ b/include/stm32/usart.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_USART_H
-#define LIBOPENSTM32_USART_H
+#ifndef LIBOPENCM3_USART_H
+#define LIBOPENCM3_USART_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/usb.h b/include/stm32/usb.h
index f9a08fc3..cf7a2617 100644
--- a/include/stm32/usb.h
+++ b/include/stm32/usb.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_USB_H
-#define LIBOPENSTM32_USB_H
+#ifndef LIBOPENCM3_USB_H
+#define LIBOPENCM3_USB_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>
diff --git a/include/stm32/usb_desc.h b/include/stm32/usb_desc.h
index e305f86f..da99bb02 100644
--- a/include/stm32/usb_desc.h
+++ b/include/stm32/usb_desc.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_USB_DESC
-#define LIBOPENSTM32_USB_DESC
+#ifndef LIBOPENCM3_USB_DESC
+#define LIBOPENCM3_USB_DESC
 
 /* Descriptor types */
 #define USB_DT_DEVICE		0x01
diff --git a/include/stm32/wwdg.h b/include/stm32/wwdg.h
index 2fcea3b8..81daf8b0 100644
--- a/include/stm32/wwdg.h
+++ b/include/stm32/wwdg.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENSTM32_WWDG_H
-#define LIBOPENSTM32_WWDG_H
+#ifndef LIBOPENCM3_WWDG_H
+#define LIBOPENCM3_WWDG_H
 
 #include <stm32/memorymap.h>
 #include <cm3/common.h>