diff --git a/libraries/EEPROM/src/EEPROM.h b/libraries/EEPROM/src/EEPROM.h
index 57271f4241..9f9a0abbea 100644
--- a/libraries/EEPROM/src/EEPROM.h
+++ b/libraries/EEPROM/src/EEPROM.h
@@ -36,8 +36,8 @@ extern "C" {
 
 struct EERef {
 
-  EERef(const int index)
-    : index(index)                 {}
+  EERef(const int idx)
+    : index(idx)                 {}
 
   //Access/read members.
   uint8_t operator*() const
@@ -140,8 +140,8 @@ struct EERef {
 
 struct EEPtr {
 
-  EEPtr(const int index)
-    : index(index)                {}
+  EEPtr(const int idx)
+    : index(idx)                {}
 
   operator int() const
   {
diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
index 07a42134bb..b98e88f52b 100644
--- a/libraries/SPI/src/SPI.h
+++ b/libraries/SPI/src/SPI.h
@@ -43,17 +43,17 @@ extern "C" {
 
 class SPISettings {
   public:
-    constexpr SPISettings(uint32_t clock, BitOrder bitOrder, uint8_t dataMode, SPIDeviceMode deviceMode = SPI_MASTER)
+    constexpr SPISettings(uint32_t clock, BitOrder order, uint8_t mode, SPIDeviceMode devMode = SPI_MASTER)
       : clockFreq(clock),
-        bitOrder(bitOrder),
-        dataMode((SPIMode)dataMode),
-        deviceMode(deviceMode)
+        bitOrder(order),
+        dataMode((SPIMode)mode),
+        deviceMode(devMode)
     { }
-    constexpr SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIDeviceMode deviceMode = SPI_MASTER)
+    constexpr SPISettings(uint32_t clock, BitOrder order, SPIMode mode, SPIDeviceMode devMode = SPI_MASTER)
       : clockFreq(clock),
-        bitOrder(bitOrder),
-        dataMode(dataMode),
-        deviceMode(deviceMode)
+        bitOrder(order),
+        dataMode(mode),
+        deviceMode(devMode)
     { }
     constexpr SPISettings()
       : clockFreq(SPI_SPEED_CLOCK_DEFAULT),
diff --git a/libraries/SrcWrapper/inc/PortNames.h b/libraries/SrcWrapper/inc/PortNames.h
index 45237226ea..1654099134 100644
--- a/libraries/SrcWrapper/inc/PortNames.h
+++ b/libraries/SrcWrapper/inc/PortNames.h
@@ -36,7 +36,7 @@
 extern "C" {
 #endif
 
-extern GPIO_TypeDef *GPIOPort[];
+extern GPIO_TypeDef *GPIOPort_list[];
 
 typedef enum {
   FirstPort = 0x00,
@@ -79,7 +79,7 @@ typedef enum {
 #define MAX_NB_PORT (LastPort-FirstPort+1)
 
 /* Return GPIO base address */
-#define get_GPIO_Port(p) ((p < MAX_NB_PORT) ? GPIOPort[p] : (GPIO_TypeDef *)NULL)
+#define get_GPIO_Port(p) ((p < MAX_NB_PORT) ? GPIOPort_list[p] : (GPIO_TypeDef *)NULL)
 /* Enable GPIO clock and return GPIO base address */
 GPIO_TypeDef *set_GPIO_Port_Clock(uint32_t port_idx);
 
diff --git a/libraries/SrcWrapper/src/stm32/PortNames.c b/libraries/SrcWrapper/src/stm32/PortNames.c
index 0f07ee850f..45612f799f 100644
--- a/libraries/SrcWrapper/src/stm32/PortNames.c
+++ b/libraries/SrcWrapper/src/stm32/PortNames.c
@@ -29,7 +29,7 @@
  */
 #include "PortNames.h"
 
-GPIO_TypeDef *GPIOPort[MAX_NB_PORT] = {
+GPIO_TypeDef *GPIOPort_list[MAX_NB_PORT] = {
   (GPIO_TypeDef *)GPIOA_BASE,
   (GPIO_TypeDef *)GPIOB_BASE
 #if defined GPIOC_BASE