diff --git a/hardware/geda/symbols/HRO_TYPE-C-31-M-04.sym b/hardware/geda/symbols/HRO_TYPE-C-31-M-04.sym
index 18b91d4..4b882e7 100644
--- a/hardware/geda/symbols/HRO_TYPE-C-31-M-04.sym
+++ b/hardware/geda/symbols/HRO_TYPE-C-31-M-04.sym
@@ -9,9 +9,9 @@ B 0 4400 3800 -4000 3 0 1 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 4000 3800 4000 1 0 0
 {
 T 3520 4000 9 8 1 1 0 6 1
-pinlabel=SSTX+1
+pinlabel=SSTXp1
 T 3520 4000 5 8 0 0 0 8 1
-pintype=out
+pintype=pas
 T 4080 4000 5 8 1 1 0 0 1
 pinnumber=2
 T 4080 4000 5 8 0 0 0 2 1
@@ -21,9 +21,9 @@ V 3700 4000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 3800 3800 3800 1 0 0
 {
 T 3520 3800 9 8 1 1 0 6 1
-pinlabel=SSTX-1
+pinlabel=SSTXn1
 T 3520 3800 5 8 0 0 0 8 1
-pintype=out
+pintype=pas
 T 4080 3800 5 8 1 1 0 0 1
 pinnumber=3
 T 4080 3800 5 8 0 0 0 2 1
@@ -45,7 +45,7 @@ V 3700 3600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 3400 3800 3400 1 0 0
 {
 T 3520 3400 9 8 1 1 0 6 1
-pinlabel=D+1
+pinlabel=Dp1
 T 3520 3400 5 8 0 0 0 8 1
 pintype=pas
 T 4080 3400 5 8 1 1 0 0 1
@@ -57,7 +57,7 @@ V 3700 3400 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 3200 3800 3200 1 0 0
 {
 T 3520 3200 9 8 1 1 0 6 1
-pinlabel=D-1
+pinlabel=Dn1
 T 3520 3200 5 8 0 0 0 8 1
 pintype=pas
 T 4080 3200 5 8 1 1 0 0 1
@@ -81,9 +81,9 @@ V 3700 3000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 2800 3800 2800 1 0 0
 {
 T 3520 2800 9 8 1 1 0 6 1
-pinlabel=SSRX-2
+pinlabel=SSRXn2
 T 3520 2800 5 8 0 0 0 8 1
-pintype=in
+pintype=pas
 T 4080 2800 5 8 1 1 0 0 1
 pinnumber=10
 T 4080 2800 5 8 0 0 0 2 1
@@ -93,9 +93,9 @@ V 3700 2800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 2600 3800 2600 1 0 0
 {
 T 3520 2600 9 8 1 1 0 6 1
-pinlabel=SSRX+2
+pinlabel=SSRXp2
 T 3520 2600 5 8 0 0 0 8 1
-pintype=in
+pintype=pas
 T 4080 2600 5 8 1 1 0 0 1
 pinnumber=11
 T 4080 2600 5 8 0 0 0 2 1
@@ -105,9 +105,9 @@ V 3700 2600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 2200 3800 2200 1 0 0
 {
 T 3520 2200 9 8 1 1 0 6 1
-pinlabel=SSRX+1
+pinlabel=SSRXp1
 T 3520 2200 5 8 0 0 0 8 1
-pintype=in
+pintype=pas
 T 4080 2200 5 8 1 1 0 0 1
 pinnumber=14
 T 4080 2200 5 8 0 0 0 2 1
@@ -117,9 +117,9 @@ V 3700 2200 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 2000 3800 2000 1 0 0
 {
 T 3520 2000 9 8 1 1 0 6 1
-pinlabel=SSRX-1
+pinlabel=SSRXn1
 T 3520 2000 5 8 0 0 0 8 1
-pintype=in
+pintype=pas
 T 4080 2000 5 8 1 1 0 0 1
 pinnumber=15
 T 4080 2000 5 8 0 0 0 2 1
@@ -141,7 +141,7 @@ V 3700 1800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 1600 3800 1600 1 0 0
 {
 T 3520 1600 9 8 1 1 0 6 1
-pinlabel=D-2
+pinlabel=Dn2
 T 3520 1600 5 8 0 0 0 8 1
 pintype=pas
 T 4080 1600 5 8 1 1 0 0 1
@@ -153,7 +153,7 @@ V 3700 1600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 1400 3800 1400 1 0 0
 {
 T 3520 1400 9 8 1 1 0 6 1
-pinlabel=D+2
+pinlabel=Dp2
 T 3520 1400 5 8 0 0 0 8 1
 pintype=pas
 T 4080 1400 5 8 1 1 0 0 1
@@ -177,9 +177,9 @@ V 3700 1200 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 1000 3800 1000 1 0 0
 {
 T 3520 1000 9 8 1 1 0 6 1
-pinlabel=SSTX-2
+pinlabel=SSTXn2
 T 3520 1000 5 8 0 0 0 8 1
-pintype=out
+pintype=pas
 T 4080 1000 5 8 1 1 0 0 1
 pinnumber=22
 T 4080 1000 5 8 0 0 0 2 1
@@ -189,9 +189,9 @@ V 3700 1000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 4200 800 3800 800 1 0 0
 {
 T 3520 800 9 8 1 1 0 6 1
-pinlabel=SSTX+2
+pinlabel=SSTXp2
 T 3520 800 5 8 0 0 0 8 1
-pintype=out
+pintype=pas
 T 4080 800 5 8 1 1 0 0 1
 pinnumber=23
 T 4080 800 5 8 0 0 0 2 1
diff --git a/hardware/library/connector_usb-c_hro_type-c-31-m-04.yaml b/hardware/library/connector_usb-c_hro_type-c-31-m-04.yaml
index 20ae593..7cbd0af 100644
--- a/hardware/library/connector_usb-c_hro_type-c-31-m-04.yaml
+++ b/hardware/library/connector_usb-c_hro_type-c-31-m-04.yaml
@@ -5,23 +5,23 @@ keywords: connector, USB
 
 pinout:
   A:
-    SSTX+1: 2
-    SSTX-1: 3
+    SSTXp1: 2
+    SSTXn1: 3
     CC1: 5
-    D+1: 6
-    D-1: 7
+    Dp1: 6
+    Dn1: 7
     SBU1: 8
-    SSRX-2: 10
-    SSRX+2: 11
+    SSRXn2: 10
+    SSRXp2: 11
   B:
-    SSRX+1: 14
-    SSRX-1: 15
+    SSRXp1: 14
+    SSRXn1: 15
     SBU2: 17
-    D-2: 18
-    D+2: 19
+    Dn2: 18
+    Dp2: 19
     CC2: 20
-    SSTX-2: 22
-    SSTX+2: 23
+    SSTXn2: 22
+    SSTXp2: 23
   GND: 1, 12, 13, 24
   VBUS: 4, 9, 16, 21
   SHIELD: 25, 26, 27, 28
diff --git a/hardware/usb_cable_tester.lht b/hardware/usb_cable_tester.lht
index 9762175..9f4f17a 100644
--- a/hardware/usb_cable_tester.lht
+++ b/hardware/usb_cable_tester.lht
@@ -23277,6 +23277,7 @@ ha:pcb-rnd-board-v6 {
           proto=1; x=8.05mm; y=907.20472441mil; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
           ha:flags {
            clearline=1
+           warn=1
           }
 
           li:thermal {
@@ -27494,6 +27495,7 @@ ha:pcb-rnd-board-v6 {
            proto=1; x=44.6mm; y=12.6mm; rot=0.000000; xmirror=1; smirror=1; clearance=0.2mm;
            ha:flags {
             clearline=1
+            warn=1
            }
 
            li:thermal {
@@ -45346,15 +45348,15 @@ ha:pcb-rnd-board-v6 {
     ha:LIGHTNING_DEVICE_L1P {
     li:conn { J11-7; U2-13;    }
     }
-    ha:USB-C_HOST_SSTXM1 {
-    li:conn { J2-3; U2-90;    }
-    }
-    ha:USB-C_HOST_SSTXM2 {
-    li:conn { J2-22; U2-118;    }
-    }
     ha:LIGHTNING_DEVICE_GND {
     li:conn { J11-1; U2-22;    }
     }
+     ha:USB-C_HOST_SSTXN1 {
+     li:conn { J2-3; U2-90;     }
+     }
+     ha:USB-C_HOST_SSTXN2 {
+     li:conn { J2-22; U2-118;     }
+     }
     ha:Vcc {
     li:conn { C3-2; S1-2; U3-3;    }
     }
@@ -45379,12 +45381,12 @@ ha:pcb-rnd-board-v6 {
     ha:I2C_SDA {
     li:conn { R11-1; U2-137; U5-4; U6-20;    }
     }
+     ha:USB-C_HOST_VBUS4 {
+     li:conn { J2-21; U2-119;     }
+     }
     ha:USB-C_HOST_VBUS3 {
     li:conn { J2-16; U2-124;    }
     }
-    ha:USB-C_HOST_VBUS4 {
-    li:conn { J2-21; U2-119;    }
-    }
     ha:I2C_SCL {
     li:conn { R10-1; U2-136; U5-3; U6-19;    }
     }
@@ -45532,12 +45534,12 @@ ha:pcb-rnd-board-v6 {
     ha:VUSB {
     li:conn { C5-2; J3-1; R7-2; S1-1; U4-4; U4-8;    }
     }
-    ha:USB-C_DEVICE_SSRXM1 {
-    li:conn { J10-15; U2-60;    }
-    }
-    ha:USB-C_DEVICE_SSRXM2 {
-    li:conn { J10-10; U2-42;    }
-    }
+     ha:USB-C_DEVICE_SSRXN1 {
+     li:conn { J10-15; U2-60;     }
+     }
+     ha:USB-C_DEVICE_SSRXN2 {
+     li:conn { J10-10; U2-42;     }
+     }
     ha:USB-C_DEVICE_SSRXP1 {
     li:conn { J10-14; U2-65;    }
     }
@@ -45550,12 +45552,12 @@ ha:pcb-rnd-board-v6 {
     ha:USB-C_HOST_CC1 {
     li:conn { J2-5; U2-96;    }
     }
-    ha:USB-C_DEVICE_DM1 {
-    li:conn { J10-7; U2-45;    }
-    }
-    ha:USB-C_DEVICE_DM2 {
-    li:conn { J10-18; U2-58;    }
-    }
+     ha:USB-C_DEVICE_DN1 {
+     li:conn { J10-7; U2-45;     }
+     }
+     ha:USB-C_DEVICE_DN2 {
+     li:conn { J10-18; U2-58;     }
+     }
     ha:USB-A_DEVICE_SSRXM {
     li:conn { J5-5; U2-134;    }
     }
@@ -45592,39 +45594,39 @@ ha:pcb-rnd-board-v6 {
       ha:unnamed_net17 {
       li:conn { J9-9; U6-8;      }
       }
-      ha:USB-C_HOST_SSRXM1 {
-      li:conn { J2-15; U2-125;      }
-      }
-      ha:USB-C_HOST_SSRXM2 {
-      li:conn { J2-10; U2-101;      }
-      }
       ha:unnamed_net18 {
       li:conn { J9-10; U6-7;      }
       }
       ha:unnamed_net19 {
       li:conn { J9-11; U6-6;      }
       }
+      ha:unnamed_net20 {
+      li:conn { J9-12; U6-5;      }
+      }
+      ha:unnamed_net21 {
+      li:conn { J9-13; U6-4;      }
+      }
      ha:unnamed_net22 {
      li:conn { J9-14; U6-3;     }
      }
+      ha:USB-C_HOST_SSRXN1 {
+      li:conn { J2-15; U2-125;      }
+      }
+      ha:USB-C_HOST_SSRXN2 {
+      li:conn { J2-10; U2-101;      }
+      }
+      ha:unnamed_net25 {
+      li:conn { J9-16; U6-1;      }
+      }
+      ha:unnamed_net26 {
+      li:conn { J9-2; U6-15;      }
+      }
      ha:unnamed_net23 {
      li:conn { J9-3; U6-14;     }
      }
-                 ha:unnamed_net20 {
-                 li:conn { J9-12; U6-5;                 }
-                 }
-                 ha:unnamed_net21 {
-                 li:conn { J9-13; U6-4;                 }
-                 }
-                ha:unnamed_net26 {
-                li:conn { J9-2; U6-15;                }
-                }
                 ha:unnamed_net24 {
                 li:conn { J9-15; U6-2;                }
                 }
-               ha:unnamed_net25 {
-               li:conn { J9-16; U6-1;               }
-               }
                      ha:USB-MINIB_DEVICE_VBUS {
                      li:conn { J7-1; U2-3;                     }
                      }
@@ -45658,12 +45660,12 @@ ha:pcb-rnd-board-v6 {
      ha:USB-C_HOST_SBU2 {
      li:conn { J2-17; U2-132;     }
      }
-    ha:USB-C_HOST_DM1 {
-    li:conn { J2-7; U2-100;    }
-    }
-    ha:USB-C_HOST_DM2 {
-    li:conn { J2-18; U2-123;    }
-    }
+     ha:USB-C_HOST_DN1 {
+     li:conn { J2-7; U2-100;     }
+     }
+     ha:USB-C_HOST_DN2 {
+     li:conn { J2-18; U2-123;     }
+     }
     ha:USB-A_HOST_SSRXM {
     li:conn { J1-5; U2-85;    }
     }
@@ -45733,15 +45735,15 @@ ha:pcb-rnd-board-v6 {
      ha:USB-C_DEVICE_SBU2 {
      li:conn { J10-17; U2-66;     }
      }
-    ha:USB-C_DEVICE_SSTXM1 {
-    li:conn { J10-3; U2-49;    }
-    }
-    ha:USB-C_DEVICE_SSTXM2 {
-    li:conn { J10-22; U2-55;    }
-    }
     ha:USB-MICROB_DEVICE_VBUS {
     li:conn { J8-1; U2-80;    }
     }
+     ha:USB-C_DEVICE_SSTXN1 {
+     li:conn { J10-3; U2-49;     }
+     }
+     ha:USB-C_DEVICE_SSTXN2 {
+     li:conn { J10-22; U2-55;     }
+     }
     ha:USB-C_DEVICE_SSTXP1 {
     li:conn { J10-2; U2-50;    }
     }
diff --git a/hardware/usb_cable_tester.sch b/hardware/usb_cable_tester.sch
index e6739b9..4d16ff2 100644
--- a/hardware/usb_cable_tester.sch
+++ b/hardware/usb_cable_tester.sch
@@ -571,20 +571,20 @@ value=USB-C_DEVICE_GND2
 C 8600 9500 1 180 1 passive-1.sym
 {
 T 9500 9300 5 10 0 0 180 6 1
-net=USB-C_DEVICE_SSRXM1:1
+net=USB-C_DEVICE_SSRXN1:1
 T 8800 8800 5 10 0 0 180 6 1
 device=none
 T 9500 9400 5 10 1 1 180 7 1
-value=USB-C_DEVICE_SSRXM1
+value=USB-C_DEVICE_SSRXN1
 }
 C 4200 11100 1 0 1 passive-1.sym
 {
 T 3300 11300 5 10 0 0 0 6 1
-net=USB-C_DEVICE_SSRXM2:1
+net=USB-C_DEVICE_SSRXN2:1
 T 4000 11800 5 10 0 0 0 6 1
 device=none
 T 3300 11200 5 10 1 1 0 7 1
-value=USB-C_DEVICE_SSRXM2
+value=USB-C_DEVICE_SSRXN2
 }
 C 4200 11300 1 0 1 passive-1.sym
 {
@@ -598,11 +598,11 @@ value=USB-C_DEVICE_SSRXP2
 C 4200 4500 1 0 1 passive-1.sym
 {
 T 3300 4700 5 10 0 0 0 6 1
-net=USB-C_DEVICE_DM1:1
+net=USB-C_DEVICE_DN1:1
 T 4000 5200 5 10 0 0 0 6 1
 device=none
 T 3300 4600 5 10 1 1 0 7 1
-value=USB-C_DEVICE_DM1
+value=USB-C_DEVICE_DN1
 }
 C 4200 8900 1 0 1 passive-1.sym
 {
@@ -661,20 +661,20 @@ value=USB-C_DEVICE_SBU1
 C 8600 5700 1 180 1 passive-1.sym
 {
 T 9500 5500 5 10 0 0 180 6 1
-net=USB-C_DEVICE_SSTXM1:1
+net=USB-C_DEVICE_SSTXN1:1
 T 8800 5000 5 10 0 0 180 6 1
 device=none
 T 9500 5600 5 10 1 1 180 7 1
-value=USB-C_DEVICE_SSTXM1
+value=USB-C_DEVICE_SSTXN1
 }
 C 8600 4900 1 180 1 passive-1.sym
 {
 T 9500 4700 5 10 0 0 180 6 1
-net=USB-C_DEVICE_SSTXM2:1
+net=USB-C_DEVICE_SSTXN2:1
 T 8800 4200 5 10 0 0 180 6 1
 device=none
 T 9500 4800 5 10 1 1 180 7 1
-value=USB-C_DEVICE_SSTXM2
+value=USB-C_DEVICE_SSTXN2
 }
 C 8600 5500 1 180 1 passive-1.sym
 {
@@ -1003,11 +1003,11 @@ value=USB-C_HOST_DP1
 C 4200 10900 1 180 0 passive-1.sym
 {
 T 3300 10700 5 10 0 0 180 0 1
-net=USB-C_HOST_DM1:1
+net=USB-C_HOST_DN1:1
 T 4000 10200 5 10 0 0 180 0 1
 device=none
 T 3300 10800 5 10 1 1 180 1 1
-value=USB-C_HOST_DM1
+value=USB-C_HOST_DN1
 }
 C 8600 1500 1 0 0 passive-1.sym
 {
@@ -1021,11 +1021,11 @@ value=USB-C_HOST_SSRXP1
 C 8600 2300 1 0 0 passive-1.sym
 {
 T 9500 2500 5 10 0 0 0 0 1
-net=USB-C_HOST_SSRXM1:1
+net=USB-C_HOST_SSRXN1:1
 T 8800 3000 5 10 0 0 0 0 1
 device=none
 T 9500 2400 5 10 1 1 0 1 1
-value=USB-C_HOST_SSRXM1
+value=USB-C_HOST_SSRXN1
 }
 C 4200 4500 1 180 0 passive-1.sym
 {
@@ -1111,20 +1111,20 @@ value=USB-C_HOST_VBUS3
 C 8600 3300 1 0 0 passive-1.sym
 {
 T 9500 3500 5 10 0 0 0 0 1
-net=USB-C_HOST_SSTXM1:1
+net=USB-C_HOST_SSTXN1:1
 T 8800 4000 5 10 0 0 0 0 1
 device=none
 T 9500 3400 5 10 1 1 0 1 1
-value=USB-C_HOST_SSTXM1
+value=USB-C_HOST_SSTXN1
 }
 C 8600 13700 1 0 0 passive-1.sym
 {
 T 9500 13900 5 10 0 0 0 0 1
-net=USB-C_HOST_SSTXM2:1
+net=USB-C_HOST_SSTXN2:1
 T 8800 14400 5 10 0 0 0 0 1
 device=none
 T 9500 13800 5 10 1 1 0 1 1
-value=USB-C_HOST_SSTXM2
+value=USB-C_HOST_SSTXN2
 }
 C 8600 2900 1 0 0 passive-1.sym
 {
@@ -1165,11 +1165,11 @@ value=USB-C_HOST_SSTXP2
 C 4200 10700 1 180 0 passive-1.sym
 {
 T 3300 10500 5 10 0 0 180 0 1
-net=USB-C_HOST_SSRXM2:1
+net=USB-C_HOST_SSRXN2:1
 T 4000 10000 5 10 0 0 180 0 1
 device=none
 T 3300 10600 5 10 1 1 180 1 1
-value=USB-C_HOST_SSRXM2
+value=USB-C_HOST_SSRXN2
 }
 C 4200 4300 1 180 0 passive-1.sym
 {
@@ -2103,11 +2103,11 @@ value=USB-C_HOST_VBUS1
 C 33900 8400 1 0 0 passive-1.sym
 {
 T 34800 8600 5 10 0 0 0 0 1
-net=USB-C_HOST_SSTXM1:1
+net=USB-C_HOST_SSTXN1:1
 T 34100 9100 5 10 0 0 0 0 1
 device=none
 T 34800 8500 5 10 1 1 0 1 1
-value=USB-C_HOST_SSTXM1
+value=USB-C_HOST_SSTXN1
 }
 C 33900 8200 1 0 0 passive-1.sym
 {
@@ -2130,11 +2130,11 @@ value=USB-C_HOST_DP1
 C 33900 7800 1 0 0 passive-1.sym
 {
 T 34800 8000 5 10 0 0 0 0 1
-net=USB-C_HOST_DM1:1
+net=USB-C_HOST_DN1:1
 T 34100 8500 5 10 0 0 0 0 1
 device=none
 T 34800 7900 5 10 1 1 0 1 1
-value=USB-C_HOST_DM1
+value=USB-C_HOST_DN1
 }
 C 33900 7600 1 0 0 passive-1.sym
 {
@@ -2148,11 +2148,11 @@ value=USB-C_HOST_SBU1
 C 33900 7400 1 0 0 passive-1.sym
 {
 T 34800 7600 5 10 0 0 0 0 1
-net=USB-C_HOST_SSRXM2:1
+net=USB-C_HOST_SSRXN2:1
 T 34100 8100 5 10 0 0 0 0 1
 device=none
 T 34800 7500 5 10 1 1 0 1 1
-value=USB-C_HOST_SSRXM2
+value=USB-C_HOST_SSRXN2
 }
 C 33900 7200 1 0 0 passive-1.sym
 {
@@ -2175,11 +2175,11 @@ value=USB-C_HOST_SSRXP1
 C 33900 6600 1 0 0 passive-1.sym
 {
 T 34800 6800 5 10 0 0 0 0 1
-net=USB-C_HOST_SSRXM1:1
+net=USB-C_HOST_SSRXN1:1
 T 34100 7300 5 10 0 0 0 0 1
 device=none
 T 34800 6700 5 10 1 1 0 1 1
-value=USB-C_HOST_SSRXM1
+value=USB-C_HOST_SSRXN1
 }
 C 33900 6400 1 0 0 passive-1.sym
 {
@@ -2202,11 +2202,11 @@ value=USB-C_HOST_CC2
 C 33900 5600 1 0 0 passive-1.sym
 {
 T 34800 5800 5 10 0 0 0 0 1
-net=USB-C_HOST_SSTXM2:1
+net=USB-C_HOST_SSTXN2:1
 T 34100 6300 5 10 0 0 0 0 1
 device=none
 T 34800 5700 5 10 1 1 0 1 1
-value=USB-C_HOST_SSTXM2
+value=USB-C_HOST_SSTXN2
 }
 C 33900 5400 1 0 0 passive-1.sym
 {
@@ -2672,11 +2672,11 @@ value=USB-C_DEVICE_VBUS1
 C 16100 5700 1 0 1 passive-1.sym
 {
 T 15200 5900 5 10 0 0 0 6 1
-net=USB-C_DEVICE_SSTXM1:1
+net=USB-C_DEVICE_SSTXN1:1
 T 15900 6400 5 10 0 0 0 6 1
 device=none
 T 15200 5800 5 10 1 1 0 7 1
-value=USB-C_DEVICE_SSTXM1
+value=USB-C_DEVICE_SSTXN1
 }
 C 16100 5500 1 0 1 passive-1.sym
 {
@@ -2699,11 +2699,11 @@ value=USB-C_DEVICE_DP1
 C 16100 5100 1 0 1 passive-1.sym
 {
 T 15200 5300 5 10 0 0 0 6 1
-net=USB-C_DEVICE_DM1:1
+net=USB-C_DEVICE_DN1:1
 T 15900 5800 5 10 0 0 0 6 1
 device=none
 T 15200 5200 5 10 1 1 0 7 1
-value=USB-C_DEVICE_DM1
+value=USB-C_DEVICE_DN1
 }
 C 16100 4900 1 0 1 passive-1.sym
 {
@@ -2717,11 +2717,11 @@ value=USB-C_DEVICE_SBU1
 C 16100 4700 1 0 1 passive-1.sym
 {
 T 15200 4900 5 10 0 0 0 6 1
-net=USB-C_DEVICE_SSRXM2:1
+net=USB-C_DEVICE_SSRXN2:1
 T 15900 5400 5 10 0 0 0 6 1
 device=none
 T 15200 4800 5 10 1 1 0 7 1
-value=USB-C_DEVICE_SSRXM2
+value=USB-C_DEVICE_SSRXN2
 }
 C 16100 4500 1 0 1 passive-1.sym
 {
@@ -2744,11 +2744,11 @@ value=USB-C_DEVICE_SSRXP1
 C 16100 3900 1 0 1 passive-1.sym
 {
 T 15200 4100 5 10 0 0 0 6 1
-net=USB-C_DEVICE_SSRXM1:1
+net=USB-C_DEVICE_SSRXN1:1
 T 15900 4600 5 10 0 0 0 6 1
 device=none
 T 15200 4000 5 10 1 1 0 7 1
-value=USB-C_DEVICE_SSRXM1
+value=USB-C_DEVICE_SSRXN1
 }
 C 16100 3700 1 0 1 passive-1.sym
 {
@@ -2771,11 +2771,11 @@ value=USB-C_DEVICE_CC2
 C 16100 2900 1 0 1 passive-1.sym
 {
 T 15200 3100 5 10 0 0 0 6 1
-net=USB-C_DEVICE_SSTXM2:1
+net=USB-C_DEVICE_SSTXN2:1
 T 15900 3600 5 10 0 0 0 6 1
 device=none
 T 15200 3000 5 10 1 1 0 7 1
-value=USB-C_DEVICE_SSTXM2
+value=USB-C_DEVICE_SSTXN2
 }
 C 16100 2700 1 0 1 passive-1.sym
 {
@@ -3220,11 +3220,11 @@ value=USB-A_HOST_SSTXM
 C 16100 3500 1 0 1 passive-1.sym
 {
 T 15200 3700 5 10 0 0 0 6 1
-net=USB-C_DEVICE_DM2:1
+net=USB-C_DEVICE_DN2:1
 T 15900 4200 5 10 0 0 0 6 1
 device=none
 T 15200 3600 5 10 1 1 0 7 1
-value=USB-C_DEVICE_DM2
+value=USB-C_DEVICE_DN2
 }
 C 16100 3300 1 0 1 passive-1.sym
 {
@@ -3247,20 +3247,20 @@ value=USB-C_HOST_DP2
 C 8600 13100 1 0 0 passive-1.sym
 {
 T 9500 13300 5 10 0 0 0 0 1
-net=USB-C_HOST_DM2:1
+net=USB-C_HOST_DN2:1
 T 8800 13800 5 10 0 0 0 0 1
 device=none
 T 9500 13200 5 10 1 1 0 1 1
-value=USB-C_HOST_DM2
+value=USB-C_HOST_DN2
 }
 C 33900 6200 1 0 0 passive-1.sym
 {
 T 34800 6400 5 10 0 0 0 0 1
-net=USB-C_HOST_DM2:1
+net=USB-C_HOST_DN2:1
 T 34100 6900 5 10 0 0 0 0 1
 device=none
 T 34800 6300 5 10 1 1 0 1 1
-value=USB-C_HOST_DM2
+value=USB-C_HOST_DN2
 }
 C 33900 6000 1 0 0 passive-1.sym
 {
@@ -3274,11 +3274,11 @@ value=USB-C_HOST_DP2
 C 8600 9900 1 180 1 passive-1.sym
 {
 T 9500 9700 5 10 0 0 180 6 1
-net=USB-C_DEVICE_DM2:1
+net=USB-C_DEVICE_DN2:1
 T 8800 9200 5 10 0 0 180 6 1
 device=none
 T 9500 9800 5 10 1 1 180 7 1
-value=USB-C_DEVICE_DM2
+value=USB-C_DEVICE_DN2
 }
 C 8600 4300 1 180 1 passive-1.sym
 {