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 6d933f0..18b91d4 100644
--- a/hardware/geda/symbols/HRO_TYPE-C-31-M-04.sym
+++ b/hardware/geda/symbols/HRO_TYPE-C-31-M-04.sym
@@ -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=D-2
 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=D+2
 T 3520 1400 5 8 0 0 0 8 1
 pintype=pas
 T 4080 1400 5 8 1 1 0 0 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 5c401f5..20ae593 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
@@ -17,8 +17,8 @@ pinout:
     SSRX+1: 14
     SSRX-1: 15
     SBU2: 17
-    D+2: 18
-    D-2: 19
+    D-2: 18
+    D+2: 19
     CC2: 20
     SSTX-2: 22
     SSTX+2: 23
diff --git a/hardware/usb_cable_tester.lht b/hardware/usb_cable_tester.lht
index 823566a..9762175 100644
--- a/hardware/usb_cable_tester.lht
+++ b/hardware/usb_cable_tester.lht
@@ -45321,10 +45321,10 @@ ha:pcb-rnd-board-v6 {
      grid_unit = mm
      ha:view {
       flip_x = 0
-      flip_y = 0
+      flip_y = 1
      }
       buffer_number = 0
-      show_solder_side = 0
+      show_solder_side = 1
       grids_idx = 9
       grid = 100.00 um
        clear_line = true
@@ -45554,7 +45554,7 @@ ha:pcb-rnd-board-v6 {
     li:conn { J10-7; U2-45;    }
     }
     ha:USB-C_DEVICE_DM2 {
-    li:conn { J10-19; U2-57;    }
+    li:conn { J10-18; U2-58;    }
     }
     ha:USB-A_DEVICE_SSRXM {
     li:conn { J5-5; U2-134;    }
@@ -45566,7 +45566,7 @@ ha:pcb-rnd-board-v6 {
     li:conn { J10-6; U2-46;    }
     }
     ha:USB-C_DEVICE_DP2 {
-    li:conn { J10-18; U2-58;    }
+    li:conn { J10-19; U2-57;    }
     }
      ha:unnamed_net11 {
      li:conn { D1-1; R6-1;     }
@@ -45662,7 +45662,7 @@ ha:pcb-rnd-board-v6 {
     li:conn { J2-7; U2-100;    }
     }
     ha:USB-C_HOST_DM2 {
-    li:conn { J2-19; U2-122;    }
+    li:conn { J2-18; U2-123;    }
     }
     ha:USB-A_HOST_SSRXM {
     li:conn { J1-5; U2-85;    }
@@ -45686,7 +45686,7 @@ ha:pcb-rnd-board-v6 {
     li:conn { J2-6; U2-98;    }
     }
     ha:USB-C_HOST_DP2 {
-    li:conn { J2-18; U2-123;    }
+    li:conn { J2-19; U2-122;    }
     }
     ha:RST {
     li:conn { R4-1; S2-2; U2-25;    }
diff --git a/hardware/usb_cable_tester.sch b/hardware/usb_cable_tester.sch
index 00c50d4..e6739b9 100644
--- a/hardware/usb_cable_tester.sch
+++ b/hardware/usb_cable_tester.sch
@@ -604,15 +604,6 @@ device=none
 T 3300 4600 5 10 1 1 0 7 1
 value=USB-C_DEVICE_DM1
 }
-C 8600 4300 1 180 1 passive-1.sym
-{
-T 9500 4100 5 10 0 0 180 6 1
-net=USB-C_DEVICE_DM2:1
-T 8800 3600 5 10 0 0 180 6 1
-device=none
-T 9500 4200 5 10 1 1 180 7 1
-value=USB-C_DEVICE_DM2
-}
 C 4200 8900 1 0 1 passive-1.sym
 {
 T 3300 9100 5 10 0 0 0 6 1
@@ -622,15 +613,6 @@ device=none
 T 3300 9000 5 10 1 1 0 7 1
 value=USB-C_DEVICE_DP1
 }
-C 8600 9900 1 180 1 passive-1.sym
-{
-T 9500 9700 5 10 0 0 180 6 1
-net=USB-C_DEVICE_DP2: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_DP2
-}
 C 4200 10900 1 0 1 passive-1.sym
 {
 T 3300 11100 5 10 0 0 0 6 1
@@ -1009,15 +991,6 @@ device=none
 T 9500 1800 5 10 1 1 0 1 1
 value=USB-C_HOST_SHIELD
 }
-C 8600 13100 1 0 0 passive-1.sym
-{
-T 9500 13300 5 10 0 0 0 0 1
-net=USB-C_HOST_DP2: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_DP2
-}
 C 4200 4100 1 180 0 passive-1.sym
 {
 T 3300 3900 5 10 0 0 180 0 1
@@ -1027,15 +1000,6 @@ device=none
 T 3300 4000 5 10 1 1 180 1 1
 value=USB-C_HOST_DP1
 }
-C 8600 13300 1 0 0 passive-1.sym
-{
-T 9500 13500 5 10 0 0 0 0 1
-net=USB-C_HOST_DM2:1
-T 8800 14000 5 10 0 0 0 0 1
-device=none
-T 9500 13400 5 10 1 1 0 1 1
-value=USB-C_HOST_DM2
-}
 C 4200 10900 1 180 0 passive-1.sym
 {
 T 3300 10700 5 10 0 0 180 0 1
@@ -2226,24 +2190,6 @@ device=none
 T 34800 6500 5 10 1 1 0 1 1
 value=USB-C_HOST_SBU2
 }
-C 33900 6200 1 0 0 passive-1.sym
-{
-T 34800 6400 5 10 0 0 0 0 1
-net=USB-C_HOST_DP2: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_DP2
-}
-C 33900 6000 1 0 0 passive-1.sym
-{
-T 34800 6200 5 10 0 0 0 0 1
-net=USB-C_HOST_DM2:1
-T 34100 6700 5 10 0 0 0 0 1
-device=none
-T 34800 6100 5 10 1 1 0 1 1
-value=USB-C_HOST_DM2
-}
 C 33900 5800 1 0 0 passive-1.sym
 {
 T 34800 6000 5 10 0 0 0 0 1
@@ -2813,24 +2759,6 @@ device=none
 T 15200 3800 5 10 1 1 0 7 1
 value=USB-C_DEVICE_SBU2
 }
-C 16100 3500 1 0 1 passive-1.sym
-{
-T 15200 3700 5 10 0 0 0 6 1
-net=USB-C_DEVICE_DP2: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_DP2
-}
-C 16100 3300 1 0 1 passive-1.sym
-{
-T 15200 3500 5 10 0 0 0 6 1
-net=USB-C_DEVICE_DM2:1
-T 15900 4000 5 10 0 0 0 6 1
-device=none
-T 15200 3400 5 10 1 1 0 7 1
-value=USB-C_DEVICE_DM2
-}
 C 16100 3100 1 0 1 passive-1.sym
 {
 T 15200 3300 5 10 0 0 0 6 1
@@ -3289,3 +3217,75 @@ device=none
 T 3300 3600 5 10 1 1 180 1 1
 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
+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
+}
+C 16100 3300 1 0 1 passive-1.sym
+{
+T 15200 3500 5 10 0 0 0 6 1
+net=USB-C_DEVICE_DP2:1
+T 15900 4000 5 10 0 0 0 6 1
+device=none
+T 15200 3400 5 10 1 1 0 7 1
+value=USB-C_DEVICE_DP2
+}
+C 8600 13300 1 0 0 passive-1.sym
+{
+T 9500 13500 5 10 0 0 0 0 1
+net=USB-C_HOST_DP2:1
+T 8800 14000 5 10 0 0 0 0 1
+device=none
+T 9500 13400 5 10 1 1 0 1 1
+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
+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
+}
+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
+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
+}
+C 33900 6000 1 0 0 passive-1.sym
+{
+T 34800 6200 5 10 0 0 0 0 1
+net=USB-C_HOST_DP2:1
+T 34100 6700 5 10 0 0 0 0 1
+device=none
+T 34800 6100 5 10 1 1 0 1 1
+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
+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
+}
+C 8600 4300 1 180 1 passive-1.sym
+{
+T 9500 4100 5 10 0 0 180 6 1
+net=USB-C_DEVICE_DP2:1
+T 8800 3600 5 10 0 0 180 6 1
+device=none
+T 9500 4200 5 10 1 1 180 7 1
+value=USB-C_DEVICE_DP2
+}