diff --git a/examples/lpc13xx/lpc-p1343/miniblink/README b/examples/lpc13xx/lpc-p1343/miniblink/README
index 9595aab2..abf4473b 100644
--- a/examples/lpc13xx/lpc-p1343/miniblink/README
+++ b/examples/lpc13xx/lpc-p1343/miniblink/README
@@ -2,7 +2,7 @@
 README
 ------------------------------------------------------------------------------
 
-This is the smallest-possible example program using libopenstm32.
+This is the smallest-possible example program using libopencm3.
 
 It's intended for the NXP LPC1343-based Olimex LPC-1343 eval board (see
 http://olimex.com/dev/lpc-p1343.html for details). It should blink
diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld b/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
index 3038601b..1d24b184 100644
--- a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
+++ b/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
@@ -24,6 +24,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.ld b/examples/stm32/lisa-m/usb_hid/usbhid.ld
index 2c85647e..f70ddeea 100644
--- a/examples/stm32/lisa-m/usb_hid/usbhid.ld
+++ b/examples/stm32/lisa-m/usb_hid/usbhid.ld
@@ -27,6 +27,6 @@ MEMORY
 }
 
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/mb525/fancyblink/README b/examples/stm32/mb525/fancyblink/README
index 8590e832..226cb21e 100644
--- a/examples/stm32/mb525/fancyblink/README
+++ b/examples/stm32/mb525/fancyblink/README
@@ -2,7 +2,7 @@
 README
 ------------------------------------------------------------------------------
 
-This is a blink example program using libopenstm32.
+This is a blink example program using libopencm3.
 
 It's intended for the ST STM32-based MB525 eval board (see
 http://www.st.com/stonline/products/literature/um/13472.htm for details).
diff --git a/examples/stm32/mb525/fancyblink/fancyblink.ld b/examples/stm32/mb525/fancyblink/fancyblink.ld
index 0dc97080..abe9cea7 100644
--- a/examples/stm32/mb525/fancyblink/fancyblink.ld
+++ b/examples/stm32/mb525/fancyblink/fancyblink.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/mb525/pwmleds/README b/examples/stm32/mb525/pwmleds/README
index 3e4cb4d1..b2a6d95d 100644
--- a/examples/stm32/mb525/pwmleds/README
+++ b/examples/stm32/mb525/pwmleds/README
@@ -2,7 +2,7 @@
 README
 ------------------------------------------------------------------------------
 
-This is a PWM based LED fading example using libopenstm32.
+This is a PWM based LED fading example using libopencm3.
 
 It's intended for the ST STM32-based MB525 eval board (see
 http://www.st.com/stonline/products/literature/um/13472.htm for details).
diff --git a/examples/stm32/mb525/pwmleds/pwmleds.ld b/examples/stm32/mb525/pwmleds/pwmleds.ld
index 0dc97080..abe9cea7 100644
--- a/examples/stm32/mb525/pwmleds/pwmleds.ld
+++ b/examples/stm32/mb525/pwmleds/pwmleds.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/obldc/can/can.ld b/examples/stm32/obldc/can/can.ld
index cb924b6a..3303f26c 100644
--- a/examples/stm32/obldc/can/can.ld
+++ b/examples/stm32/obldc/can/can.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/obldc/led/led.ld b/examples/stm32/obldc/led/led.ld
index 39f4ad05..4ca199e9 100644
--- a/examples/stm32/obldc/led/led.ld
+++ b/examples/stm32/obldc/led/led.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/obldc/systick/systick.ld b/examples/stm32/obldc/systick/systick.ld
index 1668f907..e0057d93 100644
--- a/examples/stm32/obldc/systick/systick.ld
+++ b/examples/stm32/obldc/systick/systick.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/obldc/usart/usart.ld b/examples/stm32/obldc/usart/usart.ld
index 39f4ad05..4ca199e9 100644
--- a/examples/stm32/obldc/usart/usart.ld
+++ b/examples/stm32/obldc/usart/usart.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/obldc/usart_irq/usart_irq.ld b/examples/stm32/obldc/usart_irq/usart_irq.ld
index 39f4ad05..4ca199e9 100644
--- a/examples/stm32/obldc/usart_irq/usart_irq.ld
+++ b/examples/stm32/obldc/usart_irq/usart_irq.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/adc_temperature_sensor/adc.ld b/examples/stm32/other/adc_temperature_sensor/adc.ld
index cb924b6a..3303f26c 100644
--- a/examples/stm32/other/adc_temperature_sensor/adc.ld
+++ b/examples/stm32/other/adc_temperature_sensor/adc.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/dma_mem2mem/dma.ld b/examples/stm32/other/dma_mem2mem/dma.ld
index cb924b6a..3303f26c 100644
--- a/examples/stm32/other/dma_mem2mem/dma.ld
+++ b/examples/stm32/other/dma_mem2mem/dma.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/dogm128/main.ld b/examples/stm32/other/dogm128/main.ld
index cb924b6a..3303f26c 100644
--- a/examples/stm32/other/dogm128/main.ld
+++ b/examples/stm32/other/dogm128/main.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
index cb924b6a..3303f26c 100644
--- a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
+++ b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/rtc/rtc.ld b/examples/stm32/other/rtc/rtc.ld
index 0dc97080..abe9cea7 100644
--- a/examples/stm32/other/rtc/rtc.ld
+++ b/examples/stm32/other/rtc/rtc.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/systick/systick.ld b/examples/stm32/other/systick/systick.ld
index cb924b6a..3303f26c 100644
--- a/examples/stm32/other/systick/systick.ld
+++ b/examples/stm32/other/systick/systick.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/timer_interrupt/timer.ld b/examples/stm32/other/timer_interrupt/timer.ld
index cb924b6a..3303f26c 100644
--- a/examples/stm32/other/timer_interrupt/timer.ld
+++ b/examples/stm32/other/timer_interrupt/timer.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.ld b/examples/stm32/other/usb_cdcacm/cdcacm.ld
index 1e1df7db..0b2918ea 100644
--- a/examples/stm32/other/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32/other/usb_cdcacm/cdcacm.ld
@@ -24,6 +24,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/usb_dfu/usbdfu.ld b/examples/stm32/other/usb_dfu/usbdfu.ld
index 3038601b..1d24b184 100644
--- a/examples/stm32/other/usb_dfu/usbdfu.ld
+++ b/examples/stm32/other/usb_dfu/usbdfu.ld
@@ -24,6 +24,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/other/usb_hid/usbhid.ld b/examples/stm32/other/usb_hid/usbhid.ld
index 1e1df7db..0b2918ea 100644
--- a/examples/stm32/other/usb_hid/usbhid.ld
+++ b/examples/stm32/other/usb_hid/usbhid.ld
@@ -24,6 +24,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/stm32-h103/fancyblink/README b/examples/stm32/stm32-h103/fancyblink/README
index 791af398..bdb6ec86 100644
--- a/examples/stm32/stm32-h103/fancyblink/README
+++ b/examples/stm32/stm32-h103/fancyblink/README
@@ -2,7 +2,7 @@
 README
 ------------------------------------------------------------------------------
 
-This is small LED blinking example program using libopenstm32.
+This is small LED blinking example program using libopencm3.
 
 It's intended for the ST STM32-based Olimex STM32-H103 eval board (see
 http://olimex.com/dev/stm32-h103.html for details). It should blink
diff --git a/examples/stm32/stm32-h103/fancyblink/fancyblink.ld b/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
index 0dc97080..abe9cea7 100644
--- a/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
+++ b/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/stm32-h103/miniblink/README b/examples/stm32/stm32-h103/miniblink/README
index 66359f45..0e046f21 100644
--- a/examples/stm32/stm32-h103/miniblink/README
+++ b/examples/stm32/stm32-h103/miniblink/README
@@ -2,7 +2,7 @@
 README
 ------------------------------------------------------------------------------
 
-This is the smallest-possible example program using libopenstm32.
+This is the smallest-possible example program using libopencm3.
 
 It's intended for the ST STM32-based Olimex STM32-H103 eval board (see
 http://olimex.com/dev/stm32-h103.html for details). It should blink
diff --git a/examples/stm32/stm32-h103/miniblink/miniblink.ld b/examples/stm32/stm32-h103/miniblink/miniblink.ld
index 0dc97080..abe9cea7 100644
--- a/examples/stm32/stm32-h103/miniblink/miniblink.ld
+++ b/examples/stm32/stm32-h103/miniblink/miniblink.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/stm32-h103/spi/spi.ld b/examples/stm32/stm32-h103/spi/spi.ld
index 6243b043..b06cbed5 100644
--- a/examples/stm32/stm32-h103/spi/spi.ld
+++ b/examples/stm32/stm32-h103/spi/spi.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/stm32-h103/usart/usart.ld b/examples/stm32/stm32-h103/usart/usart.ld
index 0dc97080..abe9cea7 100644
--- a/examples/stm32/stm32-h103/usart/usart.ld
+++ b/examples/stm32/stm32-h103/usart/usart.ld
@@ -26,6 +26,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
index 2c85647e..f70ddeea 100644
--- a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
@@ -27,6 +27,6 @@ MEMORY
 }
 
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld b/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
index 3038601b..1d24b184 100644
--- a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
+++ b/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
@@ -24,6 +24,6 @@ MEMORY
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K
 }
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.ld b/examples/stm32/stm32-h103/usb_hid/usbhid.ld
index 2c85647e..f70ddeea 100644
--- a/examples/stm32/stm32-h103/usb_hid/usbhid.ld
+++ b/examples/stm32/stm32-h103/usb_hid/usbhid.ld
@@ -27,6 +27,6 @@ MEMORY
 }
 
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.ld b/examples/stm32/stm32-h103/usb_iap/usbiap.ld
index 2c85647e..f70ddeea 100644
--- a/examples/stm32/stm32-h103/usb_iap/usbiap.ld
+++ b/examples/stm32/stm32-h103/usb_iap/usbiap.ld
@@ -27,6 +27,6 @@ MEMORY
 }
 
 
-/* Include the common ld script from libopenstm32. */
+/* Include the common ld script. */
 INCLUDE stm32.ld
 
diff --git a/lib/lpc13xx/lpc13xx.ld b/lib/lpc13xx/lpc13xx.ld
index 40f76839..c709a8ce 100644
--- a/lib/lpc13xx/lpc13xx.ld
+++ b/lib/lpc13xx/lpc13xx.ld
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Generic linker script for LPC13XX targets using libopenstm32. */
+/* Generic linker script for LPC13XX targets using libopencm3. */
 
 /* Memory regions must be defined in the ld script which includes this one. */
 
diff --git a/lib/stm32/stm32.ld b/lib/stm32/stm32.ld
index 92c8382f..b0e202e9 100644
--- a/lib/stm32/stm32.ld
+++ b/lib/stm32/stm32.ld
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Generic linker script for STM32 targets using libopenstm32. */
+/* Generic linker script for STM32 targets using libopencm3. */
 
 /* Memory regions must be defined in the ld script which includes this one. */