diff --git a/include/libopencm3/stm32/f2/rcc.h b/include/libopencm3/stm32/f2/rcc.h
index 12fa2afc..c8ef7061 100644
--- a/include/libopencm3/stm32/f2/rcc.h
+++ b/include/libopencm3/stm32/f2/rcc.h
@@ -225,6 +225,21 @@
 #define RCC_AHB1RSTR_GPIOBRST			(1 << 1)
 #define RCC_AHB1RSTR_GPIOARST			(1 << 0)
 
+/** @addtogroup deprecated_201802_rcc Deprecated 2018
+ * @deprecated replace zzz_IOPxRST with zzz_GPIOxRST
+ * @{
+ */
+#define RCC_AHB1RSTR_IOPIRST	RCC_AHB1RSTR_GPIOIRST
+#define RCC_AHB1RSTR_IOPHRST	RCC_AHB1RSTR_GPIOHRST
+#define RCC_AHB1RSTR_IOPGRST	RCC_AHB1RSTR_GPIOGRST
+#define RCC_AHB1RSTR_IOPFRST	RCC_AHB1RSTR_GPIOFRST
+#define RCC_AHB1RSTR_IOPERST	RCC_AHB1RSTR_GPIOERST
+#define RCC_AHB1RSTR_IOPDRST	RCC_AHB1RSTR_GPIODRST
+#define RCC_AHB1RSTR_IOPCRST	RCC_AHB1RSTR_GPIOCRST
+#define RCC_AHB1RSTR_IOPBRST	RCC_AHB1RSTR_GPIOBRST
+#define RCC_AHB1RSTR_IOPARST	RCC_AHB1RSTR_GPIOARST
+/**@}*/
+
 /* --- RCC_AHB2RSTR values ------------------------------------------------- */
 
 #define RCC_AHB2RSTR_OTGFSRST			(1 << 7)
@@ -299,6 +314,21 @@
 #define RCC_AHB1ENR_GPIOBEN			(1 << 1)
 #define RCC_AHB1ENR_GPIOAEN			(1 << 0)
 
+/** @addtogroup deprecated_201802_rcc Deprecated 2018
+ * @deprecated replace zzz_IOPxEN with zzz_GPIOxEN
+ * @{
+ */
+#define RCC_AHB1ENR_IOPIEN	RCC_AHB1ENR_GPIOIEN
+#define RCC_AHB1ENR_IOPHEN	RCC_AHB1ENR_GPIOHEN
+#define RCC_AHB1ENR_IOPGEN	RCC_AHB1ENR_GPIOGEN
+#define RCC_AHB1ENR_IOPFEN	RCC_AHB1ENR_GPIOFEN
+#define RCC_AHB1ENR_IOPEEN	RCC_AHB1ENR_GPIOEEN
+#define RCC_AHB1ENR_IOPDEN	RCC_AHB1ENR_GPIODEN
+#define RCC_AHB1ENR_IOPCEN	RCC_AHB1ENR_GPIOCEN
+#define RCC_AHB1ENR_IOPBEN	RCC_AHB1ENR_GPIOBEN
+#define RCC_AHB1ENR_IOPAEN	RCC_AHB1ENR_GPIOAEN
+/**@}*/
+
 /* --- RCC_AHB2ENR values ------------------------------------------------- */
 
 #define RCC_AHB2ENR_OTGFSEN			(1 << 7)
@@ -378,6 +408,21 @@
 #define RCC_AHB1LPENR_GPIOBLPEN			(1 << 1)
 #define RCC_AHB1LPENR_GPIOALPEN			(1 << 0)
 
+/** @addtogroup deprecated_201802_rcc Deprecated 2018
+ * @deprecated replace zzz_IOPxLPEN with zzz_GPIOxLPEN
+ * @{
+ */
+#define RCC_AHB1LPENR_IOPILPEN	RCC_AHB1LPENR_GPIOILPEN
+#define RCC_AHB1LPENR_IOPHLPEN	RCC_AHB1LPENR_GPIOHLPEN
+#define RCC_AHB1LPENR_IOPGLPEN	RCC_AHB1LPENR_GPIOGLPEN
+#define RCC_AHB1LPENR_IOPFLPEN	RCC_AHB1LPENR_GPIOFLPEN
+#define RCC_AHB1LPENR_IOPELPEN	RCC_AHB1LPENR_GPIOELPEN
+#define RCC_AHB1LPENR_IOPDLPEN	RCC_AHB1LPENR_GPIODLPEN
+#define RCC_AHB1LPENR_IOPCLPEN	RCC_AHB1LPENR_GPIOCLPEN
+#define RCC_AHB1LPENR_IOPBLPEN	RCC_AHB1LPENR_GPIOBLPEN
+#define RCC_AHB1LPENR_IOPALPEN	RCC_AHB1LPENR_GPIOALPEN
+/**@}*/
+
 /* --- RCC_AHB2LPENR values ------------------------------------------------- */
 
 #define RCC_AHB2LPENR_OTGFSLPEN			(1 << 7)
diff --git a/include/libopencm3/stm32/f4/rcc.h b/include/libopencm3/stm32/f4/rcc.h
index 10ea486c..bd058742 100644
--- a/include/libopencm3/stm32/f4/rcc.h
+++ b/include/libopencm3/stm32/f4/rcc.h
@@ -300,6 +300,23 @@
 #define RCC_AHB1RSTR_GPIOBRST			(1 << 1)
 #define RCC_AHB1RSTR_GPIOARST			(1 << 0)
 
+/** @addtogroup deprecated_201802_rcc Deprecated 2018
+ * @deprecated replace zzz_IOPxRST with zzz_GPIOxRST
+ * @{
+ */
+#define RCC_AHB1RSTR_IOPKRST	RCC_AHB1RSTR_GPIOKRST
+#define RCC_AHB1RSTR_IOPJRST	RCC_AHB1RSTR_GPIOJRST
+#define RCC_AHB1RSTR_IOPIRST	RCC_AHB1RSTR_GPIOIRST
+#define RCC_AHB1RSTR_IOPHRST	RCC_AHB1RSTR_GPIOHRST
+#define RCC_AHB1RSTR_IOPGRST	RCC_AHB1RSTR_GPIOGRST
+#define RCC_AHB1RSTR_IOPFRST	RCC_AHB1RSTR_GPIOFRST
+#define RCC_AHB1RSTR_IOPERST	RCC_AHB1RSTR_GPIOERST
+#define RCC_AHB1RSTR_IOPDRST	RCC_AHB1RSTR_GPIODRST
+#define RCC_AHB1RSTR_IOPCRST	RCC_AHB1RSTR_GPIOCRST
+#define RCC_AHB1RSTR_IOPBRST	RCC_AHB1RSTR_GPIOBRST
+#define RCC_AHB1RSTR_IOPARST	RCC_AHB1RSTR_GPIOARST
+/**@}*/
+
 /* --- RCC_AHB2RSTR values ------------------------------------------------- */
 
 #define RCC_AHB2RSTR_OTGFSRST			(1 << 7)
@@ -392,6 +409,23 @@
 #define RCC_AHB1ENR_GPIOBEN			(1 << 1)
 #define RCC_AHB1ENR_GPIOAEN			(1 << 0)
 
+/** @addtogroup deprecated_201802_rcc Deprecated 2018
+ * @deprecated replace zzz_IOPxEN with zzz_GPIOxEN
+ * @{
+ */
+#define RCC_AHB1ENR_IOPKEN	RCC_AHB1ENR_GPIOKEN
+#define RCC_AHB1ENR_IOPJEN	RCC_AHB1ENR_GPIOJEN
+#define RCC_AHB1ENR_IOPIEN	RCC_AHB1ENR_GPIOIEN
+#define RCC_AHB1ENR_IOPHEN	RCC_AHB1ENR_GPIOHEN
+#define RCC_AHB1ENR_IOPGEN	RCC_AHB1ENR_GPIOGEN
+#define RCC_AHB1ENR_IOPFEN	RCC_AHB1ENR_GPIOFEN
+#define RCC_AHB1ENR_IOPEEN	RCC_AHB1ENR_GPIOEEN
+#define RCC_AHB1ENR_IOPDEN	RCC_AHB1ENR_GPIODEN
+#define RCC_AHB1ENR_IOPCEN	RCC_AHB1ENR_GPIOCEN
+#define RCC_AHB1ENR_IOPBEN	RCC_AHB1ENR_GPIOBEN
+#define RCC_AHB1ENR_IOPAEN	RCC_AHB1ENR_GPIOAEN
+/**@}*/
+
 /* --- RCC_AHB2ENR values ------------------------------------------------- */
 
 #define RCC_AHB2ENR_OTGFSEN			(1 << 7)
@@ -486,6 +520,23 @@
 #define RCC_AHB1LPENR_GPIOBLPEN			(1 << 1)
 #define RCC_AHB1LPENR_GPIOALPEN			(1 << 0)
 
+/** @addtogroup deprecated_201802_rcc Deprecated 2018
+ * @deprecated replace zzz_IOPxLPEN with zzz_GPIOxLPEN
+ * @{
+ */
+#define RCC_AHB1LPENR_IOPKLPEN	RCC_AHB1LPENR_GPIOKLPEN
+#define RCC_AHB1LPENR_IOPJLPEN	RCC_AHB1LPENR_GPIOJLPEN
+#define RCC_AHB1LPENR_IOPILPEN	RCC_AHB1LPENR_GPIOILPEN
+#define RCC_AHB1LPENR_IOPHLPEN	RCC_AHB1LPENR_GPIOHLPEN
+#define RCC_AHB1LPENR_IOPGLPEN	RCC_AHB1LPENR_GPIOGLPEN
+#define RCC_AHB1LPENR_IOPFLPEN	RCC_AHB1LPENR_GPIOFLPEN
+#define RCC_AHB1LPENR_IOPELPEN	RCC_AHB1LPENR_GPIOELPEN
+#define RCC_AHB1LPENR_IOPDLPEN	RCC_AHB1LPENR_GPIODLPEN
+#define RCC_AHB1LPENR_IOPCLPEN	RCC_AHB1LPENR_GPIOCLPEN
+#define RCC_AHB1LPENR_IOPBLPEN	RCC_AHB1LPENR_GPIOBLPEN
+#define RCC_AHB1LPENR_IOPALPEN	RCC_AHB1LPENR_GPIOALPEN
+/**@}*/
+
 /* --- RCC_AHB2LPENR values ------------------------------------------------- */
 
 #define RCC_AHB2LPENR_OTGFSLPEN			(1 << 7)