diff --git a/libraries/ESP8266WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino b/libraries/ESP8266WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
index 05bdb94aa..b31c552e3 100644
--- a/libraries/ESP8266WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
+++ b/libraries/ESP8266WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
@@ -31,7 +31,7 @@
     SWAP_PINS:
    0: use Serial1 for logging (legacy example)
    1: configure Hardware Serial port on RX:GPIO13 TX:GPIO15
-      and use SoftwareSerial for logging on
+      and use EspSoftwareSerial for logging on
       standard Serial pins RX:GPIO3 and TX:GPIO1
 */
 
@@ -84,11 +84,11 @@ void setup() {
 #if SWAP_PINS
   Serial.swap();
   // Hardware serial is now on RX:GPIO13 TX:GPIO15
-  // use SoftwareSerial on regular RX(3)/TX(1) for logging
+  // use EspSoftwareSerial on regular RX(3)/TX(1) for logging
   logger = new SoftwareSerial(3, 1);
   logger->begin(BAUD_LOGGER);
   logger->enableIntTx(false);
-  logger->println("\n\nUsing SoftwareSerial for logging");
+  logger->println("\n\nUsing EspSoftwareSerial for logging");
 #else
   logger->begin(BAUD_LOGGER);
   logger->println("\n\nUsing Serial1 for logging");
diff --git a/libraries/SoftwareSerial b/libraries/SoftwareSerial
index 12f848042..a00554a6a 160000
--- a/libraries/SoftwareSerial
+++ b/libraries/SoftwareSerial
@@ -1 +1 @@
-Subproject commit 12f848042ee87637abcafa429618a8a6910db288
+Subproject commit a00554a6ad1d28c633dd893e6d6ec4ca2811437f
diff --git a/libraries/esp8266/examples/SerialStress/SerialStress.ino b/libraries/esp8266/examples/SerialStress/SerialStress.ino
index 4a8b6e4f4..5d6aaf236 100644
--- a/libraries/esp8266/examples/SerialStress/SerialStress.ino
+++ b/libraries/esp8266/examples/SerialStress/SerialStress.ino
@@ -2,7 +2,7 @@
 /*
   Serial read/write/verify/benchmark
   Using internal loopback
-  Using SoftwareSerial library for logging
+  Using EspSoftwareSerial library for logging
 
   Sketch meant for debugging only
   Released to public domain