diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
index 45f3833..76fd1f1 100755
--- a/cores/arduino/HardwareSerial.cpp
+++ b/cores/arduino/HardwareSerial.cpp
@@ -48,7 +48,7 @@ HardwareSerial Serial0(UART4_dev);
 HardwareSerial Serial1(USART3_dev);
 HardwareSerial Serial2(USART2_dev);
 HardwareSerial Serial3(USART6_dev);
-HardwareSerial SerialESP(USART3_dev);
+HardwareSerial SerialWiFi(USART3_dev);
 
 HardwareSerial::HardwareSerial(usart_dev *usart_device)
 {
diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h
index ad37a93..fd69f54 100755
--- a/cores/arduino/HardwareSerial.h
+++ b/cores/arduino/HardwareSerial.h
@@ -88,7 +88,7 @@ extern HardwareSerial Serial5;
 extern HardwareSerial Serial6;
 extern HardwareSerial Serial7;
 extern HardwareSerial Serial8;
-extern HardwareSerial SerialESP;
+extern HardwareSerial SerialWiFi;
 
 extern HardwareSerial &SerialDebug;
 #endif
diff --git a/cores/arduino/SPI.cpp b/cores/arduino/SPI.cpp
index a158f91..c0e3531 100644
--- a/cores/arduino/SPI.cpp
+++ b/cores/arduino/SPI.cpp
@@ -345,4 +345,4 @@ void SPIClass::end(uint8_t slaveSelectPin)
 }
 
 SPIClass SPI = SPIClass(SPI2);
-SPIClass SPI_1 = SPIClass(SPI1);
+SPIClass SPI7 = SPIClass(SPI1);
diff --git a/cores/arduino/SPI.h b/cores/arduino/SPI.h
index 6739616..c72315f 100644
--- a/cores/arduino/SPI.h
+++ b/cores/arduino/SPI.h
@@ -193,6 +193,6 @@ class SPIClass {
 };
 
 extern SPIClass SPI;
-extern SPIClass SPI_1;
+extern SPIClass SPI7;
 
 #endif
diff --git a/variants/otto/variant.h b/variants/otto/variant.h
index 1395a45..641ffad 100644
--- a/variants/otto/variant.h
+++ b/variants/otto/variant.h
@@ -46,7 +46,7 @@
 #define USART2_RX_GPIO_PIN 	6
 #define USART2_RX_AF		7
 
-// USART3 - Serial1 / SerialESP
+// USART3 - Serial1 / SerialWiFi
 #define USART3_TX_GPIO_DEV	GPIOB_dev
 #define USART3_TX_GPIO_PIN 	10
 #define USART3_TX_AF		7