diff --git a/usb_cables.c b/usb_cables.c
index 94ad11f..0cf95fc 100644
--- a/usb_cables.c
+++ b/usb_cables.c
@@ -99,12 +99,12 @@ static const struct usb_pin_t usb_host_c_pins[] = {
 		.pin = GPIO15,
 	},
 	{
-		.name = "SSTX+1",
+		.name = "SSTXp1",
 		.port = GPIOG,
 		.pin = GPIO3,
 	},
 	{
-		.name = "SSTX-1",
+		.name = "SSTXn1",
 		.port = GPIOG,
 		.pin = GPIO5,
 	},
@@ -119,12 +119,12 @@ static const struct usb_pin_t usb_host_c_pins[] = {
 		.pin = GPIO6,
 	},
 	{
-		.name = "D+1",
+		.name = "Dp1",
 		.port = GPIOC,
 		.pin = GPIO8,
 	},
 	{
-		.name = "D-1",
+		.name = "Dn1",
 		.port = GPIOA,
 		.pin = GPIO8,
 	},
@@ -139,12 +139,12 @@ static const struct usb_pin_t usb_host_c_pins[] = {
 		.pin = GPIO11,
 	},
 	{
-		.name = "SSRX-2",
+		.name = "SSRXn2",
 		.port = GPIOA,
 		.pin = GPIO9,
 	},
 	{
-		.name = "SSRX+2",
+		.name = "SSRXp2",
 		.port = GPIOC,
 		.pin = GPIO9,
 	},
@@ -159,12 +159,12 @@ static const struct usb_pin_t usb_host_c_pins[] = {
 		.pin = GPIO12,
 	},
 	{
-		.name = "SSRX+1",
+		.name = "SSRXp1",
 		.port = GPIOG,
 		.pin = GPIO14,
 	},
 	{
-		.name = "SSRX-1",
+		.name = "SSRXn1",
 		.port = GPIOG,
 		.pin = GPIO10,
 	},
@@ -179,12 +179,12 @@ static const struct usb_pin_t usb_host_c_pins[] = {
 		.pin = GPIO15,
 	},
 	{
-		.name = "D-2",
+		.name = "Dn2",
 		.port = GPIOD,
 		.pin = GPIO7,
 	},
 	{
-		.name = "D+2",
+		.name = "Dp2",
 		.port = GPIOD,
 		.pin = GPIO6,
 	},
@@ -199,12 +199,12 @@ static const struct usb_pin_t usb_host_c_pins[] = {
 		.pin = GPIO5,
 	},
 	{
-		.name = "SSTX-2",
+		.name = "SSTXn2",
 		.port = GPIOD,
 		.pin = GPIO4,
 	},
 	{
-		.name = "SSTX+2",
+		.name = "SSTXp2",
 		.port = GPIOD,
 		.pin = GPIO2,
 	},
@@ -433,12 +433,12 @@ static const struct usb_pin_t usb_device_c_pins[] = {
 		.pin = GPIO13,
 	},
 	{
-		.name = "SSTX+1",
+		.name = "SSTXp1",
 		.port = GPIOF,
 		.pin = GPIO12,
 	},
 	{
-		.name = "SSTX-1",
+		.name = "SSTXn1",
 		.port = GPIOF,
 		.pin = GPIO11,
 	},
@@ -453,12 +453,12 @@ static const struct usb_pin_t usb_device_c_pins[] = {
 		.pin = GPIO1,
 	},
 	{
-		.name = "D+1",
+		.name = "Dp1",
 		.port = GPIOB,
 		.pin = GPIO0,
 	},
 	{
-		.name = "D-1",
+		.name = "Dn1",
 		.port = GPIOC,
 		.pin = GPIO5,
 	},
@@ -473,12 +473,12 @@ static const struct usb_pin_t usb_device_c_pins[] = {
 		.pin = GPIO7,
 	},
 	{
-		.name = "SSRX-2",
+		.name = "SSRXn2",
 		.port = GPIOA,
 		.pin = GPIO6,
 	},
 	{
-		.name = "SSRX+2",
+		.name = "SSRXp2",
 		.port = GPIOA,
 		.pin = GPIO5,
 	},
@@ -493,12 +493,12 @@ static const struct usb_pin_t usb_device_c_pins[] = {
 		.pin = GPIO10,
 	},
 	{
-		.name = "SSRX+1",
+		.name = "SSRXp1",
 		.port = GPIOE,
 		.pin = GPIO12,
 	},
 	{
-		.name = "SSRX-1",
+		.name = "SSRXn1",
 		.port = GPIOE,
 		.pin = GPIO9,
 	},
@@ -513,12 +513,12 @@ static const struct usb_pin_t usb_device_c_pins[] = {
 		.pin = GPIO13,
 	},
 	{
-		.name = "D-2",
+		.name = "Dn2",
 		.port = GPIOE,
 		.pin = GPIO7,
 	},
 	{
-		.name = "D+2",
+		.name = "Dp2",
 		.port = GPIOG,
 		.pin = GPIO1,
 	},
@@ -533,12 +533,12 @@ static const struct usb_pin_t usb_device_c_pins[] = {
 		.pin = GPIO0,
 	},
 	{
-		.name = "SSTX-2",
+		.name = "SSTXn2",
 		.port = GPIOF,
 		.pin = GPIO15,
 	},
 	{
-		.name = "SSTX+2",
+		.name = "SSTXp2",
 		.port = GPIOE,
 		.pin = GPIO15,
 	},
@@ -971,16 +971,16 @@ static const struct usb_connector_t* usb_c_host_connectors[] = {
 
 static const struct usb_pin_t* usb_c_host_shunt_pins[][2] = {
 	{&usb_host_c_pins[1], &usb_host_c_pins[13]}, // A1 GND, B12 GND
-	{&usb_host_c_pins[2], &usb_host_c_pins[14]}, // A2 SSTX+1, B11 SSRX+1
-	{&usb_host_c_pins[3], &usb_host_c_pins[15]}, // A3 SSTX-1, B10 SSRX-1
+	{&usb_host_c_pins[2], &usb_host_c_pins[14]}, // A2 SSTXp1, B11 SSRXp1
+	{&usb_host_c_pins[3], &usb_host_c_pins[15]}, // A3 SSTXn1, B10 SSRXn1
 	{&usb_host_c_pins[4], &usb_host_c_pins[16]}, // A4 VBUS, B9 VBUS
 	{&usb_host_c_pins[5], &usb_host_c_pins[17]}, // A5 CC1, B8 SBU2
-	{&usb_host_c_pins[6], &usb_host_c_pins[18]}, // A6 D+1, B7 D-2
-	{&usb_host_c_pins[7], &usb_host_c_pins[19]}, // A7 D-1, B6 D+2
+	{&usb_host_c_pins[6], &usb_host_c_pins[18]}, // A6 Dp1, B7 Dn2
+	{&usb_host_c_pins[7], &usb_host_c_pins[19]}, // A7 Dn1, B6 Dp2
 	{&usb_host_c_pins[8], &usb_host_c_pins[20]}, // A8 SBU1, B5 CC2
 	{&usb_host_c_pins[9], &usb_host_c_pins[21]}, // A9 VBUS, B4 VBUS
-	{&usb_host_c_pins[10], &usb_host_c_pins[22]}, // A10 SSRX-2, B3 SSTX-2
-	{&usb_host_c_pins[11], &usb_host_c_pins[23]}, // A11 SSRX+2, B2 SSTX+2
+	{&usb_host_c_pins[10], &usb_host_c_pins[22]}, // A10 SSRXn2, B3 SSTXn2
+	{&usb_host_c_pins[11], &usb_host_c_pins[23]}, // A11 SSRXp2, B2 SSTXp2
 	{&usb_host_c_pins[12], &usb_host_c_pins[24]}, // A12 GND, B1 GND
 };
 
@@ -990,16 +990,16 @@ static const struct usb_connector_t* usb_c_device_connectors[] = {
 
 static const struct usb_pin_t* usb_c_device_shunt_pins[][2] = {
 	{&usb_device_c_pins[1], &usb_device_c_pins[13]}, // A1 GND, B12 GND
-	{&usb_device_c_pins[2], &usb_device_c_pins[14]}, // A2 SSTX+1, B11 SSRX+1
-	{&usb_device_c_pins[3], &usb_device_c_pins[15]}, // A3 SSTX-1, B10 SSRX-1
+	{&usb_device_c_pins[2], &usb_device_c_pins[14]}, // A2 SSTXp1, B11 SSRXp1
+	{&usb_device_c_pins[3], &usb_device_c_pins[15]}, // A3 SSTXn1, B10 SSRXn1
 	{&usb_device_c_pins[4], &usb_device_c_pins[16]}, // A4 VBUS, B9 VBUS
 	{&usb_device_c_pins[5], &usb_device_c_pins[17]}, // A5 CC1, B8 SBU2
-	{&usb_device_c_pins[6], &usb_device_c_pins[18]}, // A6 D+1, B7 D-2
-	{&usb_device_c_pins[7], &usb_device_c_pins[19]}, // A7 D-1, B6 D+2
+	{&usb_device_c_pins[6], &usb_device_c_pins[18]}, // A6 Dp1, B7 Dn2
+	{&usb_device_c_pins[7], &usb_device_c_pins[19]}, // A7 Dn1, B6 Dp2
 	{&usb_device_c_pins[8], &usb_device_c_pins[20]}, // A8 SBU1, B5 CC2
 	{&usb_device_c_pins[9], &usb_device_c_pins[21]}, // A9 VBUS, B4 VBUS
-	{&usb_device_c_pins[10], &usb_device_c_pins[22]}, // A10 SSRX-2, B3 SSTX-2
-	{&usb_device_c_pins[11], &usb_device_c_pins[23]}, // A11 SSRX+2, B2 SSTX+2
+	{&usb_device_c_pins[10], &usb_device_c_pins[22]}, // A10 SSRXn2, B3 SSTXn2
+	{&usb_device_c_pins[11], &usb_device_c_pins[23]}, // A11 SSRXp2, B2 SSTXp2
 	{&usb_device_c_pins[12], &usb_device_c_pins[24]}, // A12 GND, B1 GND
 };