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 4b882e7..65340e4 100644
--- a/hardware/geda/symbols/HRO_TYPE-C-31-M-04.sym
+++ b/hardware/geda/symbols/HRO_TYPE-C-31-M-04.sym
@@ -5,199 +5,211 @@ T 0 0 5 8 0 0 0 0 1
 keywords=connector, USB
 T 0 0 5 8 0 0 0 0 1
 footprint=custom_HRO_TYPE-C-31-M-04.fp
-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
+B 0 4400 3400 -4000 3 0 1 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 4000 3400 4000 1 0 0
 {
-T 3520 4000 9 8 1 1 0 6 1
-pinlabel=SSTXp1
-T 3520 4000 5 8 0 0 0 8 1
-pintype=pas
-T 4080 4000 5 8 1 1 0 0 1
+T 3120 4000 9 8 1 1 0 6 1
+pinlabel=TX+1
+T 3120 4000 5 8 0 0 0 8 1
+pintype=out
+T 3680 4000 5 8 1 1 0 0 1
 pinnumber=2
-T 4080 4000 5 8 0 0 0 2 1
+T 3680 4000 5 8 0 0 0 2 1
 pinseq=2
 }
-V 3700 4000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 3800 3800 3800 1 0 0
+V 3300 4000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 3800 3400 3800 1 0 0
 {
-T 3520 3800 9 8 1 1 0 6 1
-pinlabel=SSTXn1
-T 3520 3800 5 8 0 0 0 8 1
-pintype=pas
-T 4080 3800 5 8 1 1 0 0 1
+T 3120 3800 9 8 1 1 0 6 1
+pinlabel=TX-1
+T 3120 3800 5 8 0 0 0 8 1
+pintype=out
+T 3680 3800 5 8 1 1 0 0 1
 pinnumber=3
-T 4080 3800 5 8 0 0 0 2 1
+T 3680 3800 5 8 0 0 0 2 1
 pinseq=3
 }
-V 3700 3800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 3600 3800 3600 1 0 0
+V 3300 3800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 3600 3400 3600 1 0 0
 {
-T 3520 3600 9 8 1 1 0 6 1
+T 3120 3600 9 8 1 1 0 6 1
 pinlabel=CC1
-T 3520 3600 5 8 0 0 0 8 1
+T 3120 3600 5 8 0 0 0 8 1
 pintype=io
-T 4080 3600 5 8 1 1 0 0 1
+T 3680 3600 5 8 1 1 0 0 1
 pinnumber=5
-T 4080 3600 5 8 0 0 0 2 1
+T 3680 3600 5 8 0 0 0 2 1
 pinseq=5
 }
-V 3700 3600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 3400 3800 3400 1 0 0
+V 3300 3600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 3400 3400 3400 1 0 0
 {
-T 3520 3400 9 8 1 1 0 6 1
-pinlabel=Dp1
-T 3520 3400 5 8 0 0 0 8 1
+T 3120 3400 9 8 1 1 0 6 1
+pinlabel=D+1
+T 3120 3400 5 8 0 0 0 8 1
 pintype=pas
-T 4080 3400 5 8 1 1 0 0 1
+T 3680 3400 5 8 1 1 0 0 1
 pinnumber=6
-T 4080 3400 5 8 0 0 0 2 1
+T 3680 3400 5 8 0 0 0 2 1
 pinseq=6
 }
-V 3700 3400 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 3200 3800 3200 1 0 0
+V 3300 3400 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 3200 3400 3200 1 0 0
 {
-T 3520 3200 9 8 1 1 0 6 1
-pinlabel=Dn1
-T 3520 3200 5 8 0 0 0 8 1
+T 3120 3200 9 8 1 1 0 6 1
+pinlabel=D-1
+T 3120 3200 5 8 0 0 0 8 1
 pintype=pas
-T 4080 3200 5 8 1 1 0 0 1
+T 3680 3200 5 8 1 1 0 0 1
 pinnumber=7
-T 4080 3200 5 8 0 0 0 2 1
+T 3680 3200 5 8 0 0 0 2 1
 pinseq=7
 }
-V 3700 3200 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 3000 3800 3000 1 0 0
+V 3300 3200 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 3000 3400 3000 1 0 0
 {
-T 3520 3000 9 8 1 1 0 6 1
+T 3120 3000 9 8 1 1 0 6 1
 pinlabel=SBU1
-T 3520 3000 5 8 0 0 0 8 1
-pintype=pas
-T 4080 3000 5 8 1 1 0 0 1
+T 3120 3000 5 8 0 0 0 8 1
+pintype=io
+T 3680 3000 5 8 1 1 0 0 1
 pinnumber=8
-T 4080 3000 5 8 0 0 0 2 1
+T 3680 3000 5 8 0 0 0 2 1
 pinseq=8
 }
-V 3700 3000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 2800 3800 2800 1 0 0
+V 3300 3000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 2800 3400 2800 1 0 0
 {
-T 3520 2800 9 8 1 1 0 6 1
-pinlabel=SSRXn2
-T 3520 2800 5 8 0 0 0 8 1
-pintype=pas
-T 4080 2800 5 8 1 1 0 0 1
+T 3120 2800 9 8 1 1 0 6 1
+pinlabel=RX-2
+T 3120 2800 5 8 0 0 0 8 1
+pintype=in
+T 3680 2800 5 8 1 1 0 0 1
 pinnumber=10
-T 4080 2800 5 8 0 0 0 2 1
+T 3680 2800 5 8 0 0 0 2 1
 pinseq=10
 }
-V 3700 2800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 2600 3800 2600 1 0 0
+V 3300 2800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 2600 3400 2600 1 0 0
 {
-T 3520 2600 9 8 1 1 0 6 1
-pinlabel=SSRXp2
-T 3520 2600 5 8 0 0 0 8 1
-pintype=pas
-T 4080 2600 5 8 1 1 0 0 1
+T 3120 2600 9 8 1 1 0 6 1
+pinlabel=RX+2
+T 3120 2600 5 8 0 0 0 8 1
+pintype=in
+T 3680 2600 5 8 1 1 0 0 1
 pinnumber=11
-T 4080 2600 5 8 0 0 0 2 1
+T 3680 2600 5 8 0 0 0 2 1
 pinseq=11
 }
-V 3700 2600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 2200 3800 2200 1 0 0
+V 3300 2600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 2200 3400 2200 1 0 0
 {
-T 3520 2200 9 8 1 1 0 6 1
-pinlabel=SSRXp1
-T 3520 2200 5 8 0 0 0 8 1
-pintype=pas
-T 4080 2200 5 8 1 1 0 0 1
+T 3120 2200 9 8 1 1 0 6 1
+pinlabel=RX+1
+T 3120 2200 5 8 0 0 0 8 1
+pintype=in
+T 3680 2200 5 8 1 1 0 0 1
 pinnumber=14
-T 4080 2200 5 8 0 0 0 2 1
+T 3680 2200 5 8 0 0 0 2 1
 pinseq=14
 }
-V 3700 2200 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 2000 3800 2000 1 0 0
+V 3300 2200 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 2000 3400 2000 1 0 0
 {
-T 3520 2000 9 8 1 1 0 6 1
-pinlabel=SSRXn1
-T 3520 2000 5 8 0 0 0 8 1
-pintype=pas
-T 4080 2000 5 8 1 1 0 0 1
+T 3120 2000 9 8 1 1 0 6 1
+pinlabel=RX-1
+T 3120 2000 5 8 0 0 0 8 1
+pintype=in
+T 3680 2000 5 8 1 1 0 0 1
 pinnumber=15
-T 4080 2000 5 8 0 0 0 2 1
+T 3680 2000 5 8 0 0 0 2 1
 pinseq=15
 }
-V 3700 2000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 1800 3800 1800 1 0 0
+V 3300 2000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 1800 3400 1800 1 0 0
 {
-T 3520 1800 9 8 1 1 0 6 1
+T 3120 1800 9 8 1 1 0 6 1
 pinlabel=SBU2
-T 3520 1800 5 8 0 0 0 8 1
-pintype=pas
-T 4080 1800 5 8 1 1 0 0 1
+T 3120 1800 5 8 0 0 0 8 1
+pintype=io
+T 3680 1800 5 8 1 1 0 0 1
 pinnumber=17
-T 4080 1800 5 8 0 0 0 2 1
+T 3680 1800 5 8 0 0 0 2 1
 pinseq=17
 }
-V 3700 1800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 1600 3800 1600 1 0 0
+V 3300 1800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 1600 3400 1600 1 0 0
 {
-T 3520 1600 9 8 1 1 0 6 1
-pinlabel=Dn2
-T 3520 1600 5 8 0 0 0 8 1
+T 3120 1600 9 8 1 1 0 6 1
+pinlabel=D-2
+T 3120 1600 5 8 0 0 0 8 1
 pintype=pas
-T 4080 1600 5 8 1 1 0 0 1
+T 3680 1600 5 8 1 1 0 0 1
 pinnumber=18
-T 4080 1600 5 8 0 0 0 2 1
+T 3680 1600 5 8 0 0 0 2 1
 pinseq=18
 }
-V 3700 1600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 1400 3800 1400 1 0 0
+V 3300 1600 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 1400 3400 1400 1 0 0
 {
-T 3520 1400 9 8 1 1 0 6 1
-pinlabel=Dp2
-T 3520 1400 5 8 0 0 0 8 1
+T 3120 1400 9 8 1 1 0 6 1
+pinlabel=D+2
+T 3120 1400 5 8 0 0 0 8 1
 pintype=pas
-T 4080 1400 5 8 1 1 0 0 1
+T 3680 1400 5 8 1 1 0 0 1
 pinnumber=19
-T 4080 1400 5 8 0 0 0 2 1
+T 3680 1400 5 8 0 0 0 2 1
 pinseq=19
 }
-V 3700 1400 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 1200 3800 1200 1 0 0
+V 3300 1400 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 1200 3400 1200 1 0 0
 {
-T 3520 1200 9 8 1 1 0 6 1
+T 3120 1200 9 8 1 1 0 6 1
 pinlabel=CC2
-T 3520 1200 5 8 0 0 0 8 1
+T 3120 1200 5 8 0 0 0 8 1
 pintype=io
-T 4080 1200 5 8 1 1 0 0 1
+T 3680 1200 5 8 1 1 0 0 1
 pinnumber=20
-T 4080 1200 5 8 0 0 0 2 1
+T 3680 1200 5 8 0 0 0 2 1
 pinseq=20
 }
-V 3700 1200 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 1000 3800 1000 1 0 0
+V 3300 1200 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 1000 3400 1000 1 0 0
 {
-T 3520 1000 9 8 1 1 0 6 1
-pinlabel=SSTXn2
-T 3520 1000 5 8 0 0 0 8 1
-pintype=pas
-T 4080 1000 5 8 1 1 0 0 1
+T 3120 1000 9 8 1 1 0 6 1
+pinlabel=TX-2
+T 3120 1000 5 8 0 0 0 8 1
+pintype=out
+T 3680 1000 5 8 1 1 0 0 1
 pinnumber=22
-T 4080 1000 5 8 0 0 0 2 1
+T 3680 1000 5 8 0 0 0 2 1
 pinseq=22
 }
-V 3700 1000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 4200 800 3800 800 1 0 0
+V 3300 1000 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 3800 800 3400 800 1 0 0
 {
-T 3520 800 9 8 1 1 0 6 1
-pinlabel=SSTXp2
-T 3520 800 5 8 0 0 0 8 1
-pintype=pas
-T 4080 800 5 8 1 1 0 0 1
+T 3120 800 9 8 1 1 0 6 1
+pinlabel=TX+2
+T 3120 800 5 8 0 0 0 8 1
+pintype=out
+T 3680 800 5 8 1 1 0 0 1
 pinnumber=23
-T 4080 800 5 8 0 0 0 2 1
+T 3680 800 5 8 0 0 0 2 1
 pinseq=23
 }
-V 3700 800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+V 3300 800 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 1400 4800 1400 4400 1 0 0
+{
+T 1400 4120 9 8 1 1 90 6 1
+pinlabel=VBUS
+T 1400 4120 5 8 0 0 90 8 1
+pintype=pwr
+T 1400 4680 5 8 1 1 90 0 1
+pinnumber=4
+T 1400 4680 5 8 0 0 90 2 1
+pinseq=4
+}
+V 1400 4300 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 1600 4800 1600 4400 1 0 0
 {
 T 1600 4120 9 8 1 1 90 6 1
@@ -205,9 +217,9 @@ pinlabel=VBUS
 T 1600 4120 5 8 0 0 90 8 1
 pintype=pwr
 T 1600 4680 5 8 1 1 90 0 1
-pinnumber=4
+pinnumber=9
 T 1600 4680 5 8 0 0 90 2 1
-pinseq=4
+pinseq=9
 }
 V 1600 4300 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 1800 4800 1800 4400 1 0 0
@@ -217,9 +229,9 @@ pinlabel=VBUS
 T 1800 4120 5 8 0 0 90 8 1
 pintype=pwr
 T 1800 4680 5 8 1 1 90 0 1
-pinnumber=9
+pinnumber=16
 T 1800 4680 5 8 0 0 90 2 1
-pinseq=9
+pinseq=16
 }
 V 1800 4300 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 2000 4800 2000 4400 1 0 0
@@ -229,23 +241,23 @@ pinlabel=VBUS
 T 2000 4120 5 8 0 0 90 8 1
 pintype=pwr
 T 2000 4680 5 8 1 1 90 0 1
-pinnumber=16
-T 2000 4680 5 8 0 0 90 2 1
-pinseq=16
-}
-V 2000 4300 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 2200 4800 2200 4400 1 0 0
-{
-T 2200 4120 9 8 1 1 90 6 1
-pinlabel=VBUS
-T 2200 4120 5 8 0 0 90 8 1
-pintype=pwr
-T 2200 4680 5 8 1 1 90 0 1
 pinnumber=21
-T 2200 4680 5 8 0 0 90 2 1
+T 2000 4680 5 8 0 0 90 2 1
 pinseq=21
 }
-V 2200 4300 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+V 2000 4300 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 900 0 900 400 1 0 0
+{
+T 900 680 9 8 1 1 90 0 1
+pinlabel=GND
+T 900 680 5 8 0 0 90 2 1
+pintype=pwr
+T 900 120 5 8 1 1 90 6 1
+pinnumber=1
+T 900 120 5 8 0 0 90 8 1
+pinseq=1
+}
+V 900 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 1100 0 1100 400 1 0 0
 {
 T 1100 680 9 8 1 1 90 0 1
@@ -253,9 +265,9 @@ pinlabel=GND
 T 1100 680 5 8 0 0 90 2 1
 pintype=pwr
 T 1100 120 5 8 1 1 90 6 1
-pinnumber=1
+pinnumber=12
 T 1100 120 5 8 0 0 90 8 1
-pinseq=1
+pinseq=12
 }
 V 1100 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 1300 0 1300 400 1 0 0
@@ -265,9 +277,9 @@ pinlabel=GND
 T 1300 680 5 8 0 0 90 2 1
 pintype=pwr
 T 1300 120 5 8 1 1 90 6 1
-pinnumber=12
+pinnumber=13
 T 1300 120 5 8 0 0 90 8 1
-pinseq=12
+pinseq=13
 }
 V 1300 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 1500 0 1500 400 1 0 0
@@ -277,23 +289,23 @@ pinlabel=GND
 T 1500 680 5 8 0 0 90 2 1
 pintype=pwr
 T 1500 120 5 8 1 1 90 6 1
-pinnumber=13
-T 1500 120 5 8 0 0 90 8 1
-pinseq=13
-}
-V 1500 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 1700 0 1700 400 1 0 0
-{
-T 1700 680 9 8 1 1 90 0 1
-pinlabel=GND
-T 1700 680 5 8 0 0 90 2 1
-pintype=pwr
-T 1700 120 5 8 1 1 90 6 1
 pinnumber=24
-T 1700 120 5 8 0 0 90 8 1
+T 1500 120 5 8 0 0 90 8 1
 pinseq=24
 }
-V 1700 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+V 1500 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+P 1900 0 1900 400 1 0 0
+{
+T 1900 680 9 8 1 1 90 0 1
+pinlabel=SHIELD
+T 1900 680 5 8 0 0 90 2 1
+pintype=pas
+T 1900 120 5 8 1 1 90 6 1
+pinnumber=25
+T 1900 120 5 8 0 0 90 8 1
+pinseq=25
+}
+V 1900 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 2100 0 2100 400 1 0 0
 {
 T 2100 680 9 8 1 1 90 0 1
@@ -301,9 +313,9 @@ pinlabel=SHIELD
 T 2100 680 5 8 0 0 90 2 1
 pintype=pas
 T 2100 120 5 8 1 1 90 6 1
-pinnumber=25
+pinnumber=26
 T 2100 120 5 8 0 0 90 8 1
-pinseq=25
+pinseq=26
 }
 V 2100 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 2300 0 2300 400 1 0 0
@@ -313,9 +325,9 @@ pinlabel=SHIELD
 T 2300 680 5 8 0 0 90 2 1
 pintype=pas
 T 2300 120 5 8 1 1 90 6 1
-pinnumber=26
+pinnumber=27
 T 2300 120 5 8 0 0 90 8 1
-pinseq=26
+pinseq=27
 }
 V 2300 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 P 2500 0 2500 400 1 0 0
@@ -325,24 +337,12 @@ pinlabel=SHIELD
 T 2500 680 5 8 0 0 90 2 1
 pintype=pas
 T 2500 120 5 8 1 1 90 6 1
-pinnumber=27
-T 2500 120 5 8 0 0 90 8 1
-pinseq=27
-}
-V 2500 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-P 2700 0 2700 400 1 0 0
-{
-T 2700 680 9 8 1 1 90 0 1
-pinlabel=SHIELD
-T 2700 680 5 8 0 0 90 2 1
-pintype=pas
-T 2700 120 5 8 1 1 90 6 1
 pinnumber=28
-T 2700 120 5 8 0 0 90 8 1
+T 2500 120 5 8 0 0 90 8 1
 pinseq=28
 }
-V 2700 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+V 2500 500 50 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 T 0 4460 5 10 1 1 0 0 1
 refdes=J?
-T 2760 340 9 10 1 1 0 2 1
+T 2560 340 9 10 1 1 0 2 1
 device=HRO_TYPE-C-31-M-04
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 7cbd0af..04f74d7 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:
-    SSTXp1: 2
-    SSTXn1: 3
+    TX+1: 2
+    TX-1: 3
     CC1: 5
-    Dp1: 6
-    Dn1: 7
+    D+1: 6
+    D-1: 7
     SBU1: 8
-    SSRXn2: 10
-    SSRXp2: 11
+    RX-2: 10
+    RX+2: 11
   B:
-    SSRXp1: 14
-    SSRXn1: 15
+    RX+1: 14
+    RX-1: 15
     SBU2: 17
-    Dn2: 18
-    Dp2: 19
+    D-2: 18
+    D+2: 19
     CC2: 20
-    SSTXn2: 22
-    SSTXp2: 23
+    TX-2: 22
+    TX+2: 23
   GND: 1, 12, 13, 24
   VBUS: 4, 9, 16, 21
   SHIELD: 25, 26, 27, 28
@@ -30,9 +30,9 @@ pinout:
 properties:
   power: VBUS
   ground: GND
-  bidir: D-, D+, CC1, CC2, SUB1, SUB2
-  in: SSRX-1, SSRX+1, SSRX-2, SSRX+2
-  out: SSTX-1, SSTX+1, SSTX-2, SSTX+2
+  bidir: D-, D+, CC1, CC2, SBU1, SBU2
+  in: RX-1, RX+1, RX-2, RX+2
+  out: TX-1, TX+1, TX-2, TX+2
   passive: SHIELD
   nc: MOUNTING