diff --git a/TEST_APPS/device/nanostack_mac_tester/main.cpp b/TEST_APPS/device/nanostack_mac_tester/main.cpp
index 93e96f0..ee97dd4 100644
--- a/TEST_APPS/device/nanostack_mac_tester/main.cpp
+++ b/TEST_APPS/device/nanostack_mac_tester/main.cpp
@@ -44,7 +44,7 @@
 #endif
 
 extern mac_api_s *mac_interface;
-UnbufferedSerial pc(USBTX, USBRX);
+UnbufferedSerial pc(CONSOLE_TX, CONSOLE_RX);
 osThreadId_t main_thread;
 static CircularBuffer<uint8_t, RX_BUFFER_SIZE> rx_buffer;
 static uint8_t ns_heap[HEAP_FOR_MAC_TESTER_SIZE];
diff --git a/drivers/tests/TESTS/mbed_drivers/buffered_serial/main.cpp b/drivers/tests/TESTS/mbed_drivers/buffered_serial/main.cpp
index b96c77a..4ddcb28 100644
--- a/drivers/tests/TESTS/mbed_drivers/buffered_serial/main.cpp
+++ b/drivers/tests/TESTS/mbed_drivers/buffered_serial/main.cpp
@@ -49,7 +49,7 @@
 
 
 static BufferedSerial buffered_serial_obj(
-    USBTX, USBRX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE
+    CONSOLE_TX, CONSOLE_RX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE
 );
 
 
diff --git a/drivers/tests/TESTS/mbed_drivers/unbuffered_serial/main.cpp b/drivers/tests/TESTS/mbed_drivers/unbuffered_serial/main.cpp
index 5002d82..2eaee11 100644
--- a/drivers/tests/TESTS/mbed_drivers/unbuffered_serial/main.cpp
+++ b/drivers/tests/TESTS/mbed_drivers/unbuffered_serial/main.cpp
@@ -47,7 +47,7 @@
 
 
 static UnbufferedSerial unbuffered_serial_obj(
-    USBTX, USBRX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE
+    CONSOLE_TX, CONSOLE_RX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE
 );
 
 static ssize_t unbuffered_serial_read(void *buffer, ssize_t length)
diff --git a/hal/docs/0002-pinmap-extension.md b/hal/docs/0002-pinmap-extension.md
index 5df0eed..0aa477f 100644
--- a/hal/docs/0002-pinmap-extension.md
+++ b/hal/docs/0002-pinmap-extension.md
@@ -74,7 +74,7 @@
 MBED_WEAK const PinList *pinmap_restricted_pins()
 {
     static const PinName pins[] = {
-        USBTX, USBRX
+        CONSOLE_TX, CONSOLE_RX
     };
     static const PinList pin_list = {
         sizeof(pins) / sizeof(pins[0]),