diff --git a/xschem/C4.sym b/xschem/C4.sym
index 1eb4b9f..5aaede4 100644
--- a/xschem/C4.sym
+++ b/xschem/C4.sym
@@ -23,9 +23,9 @@
 B 5 147.5 -22.5 152.5 -17.5 {name=vout dir=out }
 L 4 130 -20 150 -20 {}
 T {vout} 125 -24 0 1 0.2 0.2 {}
-B 5 147.5 -2.5 152.5 2.5 {name=vdda dir=inout }
+B 5 147.5 -2.5 152.5 2.5 {name=1v8 dir=inout }
 L 7 130 0 150 0 {}
-T {vdda} 125 -4 0 1 0.2 0.2 {}
+T {1v8} 125 -4 0 1 0.2 0.2 {}
 B 5 147.5 17.5 152.5 22.5 {name=vssa dir=inout }
 L 7 130 20 150 20 {}
 T {vssa} 125 16 0 1 0.2 0.2 {}
diff --git a/xschem/user_analog_project_wrapper.sch b/xschem/user_analog_project_wrapper.sch
index c951dba..6e73dce 100644
--- a/xschem/user_analog_project_wrapper.sch
+++ b/xschem/user_analog_project_wrapper.sch
@@ -26,7 +26,7 @@
 N 120 -980 140 -980 {
 lab=#net1}
 N 440 -1020 480 -1020 {
-lab=gpio_noesd[0]}
+lab=gpio_analog[4]}
 N 440 -1000 480 -1000 {
 lab=vccd1}
 N 440 -980 480 -980 {
@@ -92,7 +92,7 @@
 N 1510 -1019 1570 -1019 {
 lab=vin_1_com}
 N 1160 -999 1230 -999 {
-lab=gpio_noesd[1]}
+lab=gpio_analog[5]}
 N 910 -1019 1000 -1019 {
 lab=vin_1_ota}
 N 910 -979 1000 -979 {
@@ -128,7 +128,7 @@
 N 1525 -370 1570 -370 { lab=gpio_analog[11]}
 N 1630 -450 1630 -420 { lab=gpio_analog[9]}
 N 1630 -315 1630 -290 { lab=gpio_analog[10]}
-N 1690 -370 1740 -370 { lab=gpio_analog[3]}
+N 1690 -370 1740 -370 { lab=gpio_analog[12]}
 C {devices/lab_pin.sym} -430 -540 2 0 {name=l1 lab=io_analog[1]}
 C {devices/lab_pin.sym} -510 -540 0 0 {name=l2 lab=io_analog[0]}
 C {devices/lab_pin.sym} -580 -380 0 0 {name=l3 lab=io_analog[4]}
@@ -182,7 +182,7 @@
 }
 C {devices/lab_pin.sym} 120 -1000 0 0 {name=l25 sig_type=std_logic lab=gpio_analog[8]
 }
-C {devices/lab_pin.sym} 480 -1020 2 0 {name=l28 sig_type=std_logic lab=gpio_noesd[0]}
+C {devices/lab_pin.sym} 480 -1020 2 0 {name=l28 sig_type=std_logic lab=gpio_analog[4]}
 C {amux.sym} 260.1 -356.1 0 0 {name=x2}
 C {devices/lab_pin.sym} 160.12 -660.6099999999999 3 1 {name=l7 sig_type=std_logic lab=vccd1}
 C {devices/lab_pin.sym} 174.64 -114.63 0 0 {name=l8 sig_type=std_logic lab=vssa1}
@@ -196,11 +196,8 @@
 C {devices/lab_pin.sym} 275 -620 1 0 {name=l16 sig_type=std_logic lab=gpio_analog[3]}
 C {sky130_sc_ams__ota_1.sym} 1080 -999 0 0 {name=x3}
 C {sky130_sc_ams__comparator_1.sym} 1640 -989 0 0 {name=x6}
-C {devices/lab_pin.sym} 1080 -1219 0 0 {name=l17 sig_type=std_logic lab=vssa1}
-C {devices/lab_pin.sym} 1080 -819 0 0 {name=l18 sig_type=std_logic lab=vccd1
-}
-C {devices/lab_pin.sym} 1640 -819 0 0 {name=l26 sig_type=std_logic lab=vccd1}
-C {devices/lab_pin.sym} 1640 -1219 0 0 {name=l29 sig_type=std_logic lab=vssa1
+C {devices/lab_pin.sym} 1080 -819 0 0 {name=l17 sig_type=std_logic lab=vssa1}
+C {devices/lab_pin.sym} 1640 -819 0 0 {name=l29 sig_type=std_logic lab=vssa1
 }
 C {devices/lab_pin.sym} 1510 -989 0 0 {name=l30 sig_type=std_logic lab=io_in[13]
 }
@@ -208,7 +205,7 @@
 }
 C {devices/lab_pin.sym} 1188 -476 0 1 {name=l33 sig_type=std_logic lab=vin_2_com
 }
-C {devices/lab_pin.sym} 1230 -999 2 0 {name=l34 sig_type=std_logic lab=gpio_noesd[1]}
+C {devices/lab_pin.sym} 1230 -999 2 0 {name=l34 sig_type=std_logic lab=gpio_analog[5]}
 C {amux.sym} 960.0999999999999 -361.1 0 0 {name=x7}
 C {devices/lab_pin.sym} 860.12 -665.6099999999999 3 1 {name=l37 sig_type=std_logic lab=vccd1}
 C {devices/lab_pin.sym} 874.64 -119.63 0 0 {name=l38 sig_type=std_logic lab=vssa1}
@@ -219,7 +216,7 @@
 C {devices/lab_pin.sym} 935 -625 1 0 {name=l42 sig_type=std_logic lab=gpio_analog[1]}
 C {devices/lab_pin.sym} 955 -625 1 0 {name=l43 sig_type=std_logic lab=gpio_analog[2]}
 C {devices/lab_pin.sym} 975 -625 1 0 {name=l44 sig_type=std_logic lab=gpio_analog[3]}
-C {devices/lab_pin.sym} 1810 -989 2 0 {name=l31 sig_type=std_logic lab=gpio_noesd[2]}
+C {devices/lab_pin.sym} 1810 -989 2 0 {name=l31 sig_type=std_logic lab=gpio_analog[6]}
 C {devices/lab_pin.sym} 488 -491 0 1 {name=l45 sig_type=std_logic lab=vin_1_ota
 }
 C {devices/lab_pin.sym} 1188 -496 0 1 {name=l46 sig_type=std_logic lab=vin_2_ota
@@ -239,3 +236,6 @@
 C {devices/lab_pin.sym} 1630 -450 1 0 {name=l52 sig_type=std_logic lab=gpio_analog[9]}
 C {devices/lab_pin.sym} 1630 -290 3 0 {name=l53 sig_type=std_logic lab=gpio_analog[10]}
 C {devices/lab_pin.sym} 1740 -370 2 0 {name=l54 sig_type=std_logic lab=gpio_analog[12]}
+C {devices/lab_pin.sym} 1080 -1219 0 0 {name=l55 sig_type=std_logic lab=vccd1
+}
+C {devices/lab_pin.sym} 1640 -1219 0 0 {name=l56 sig_type=std_logic lab=vccd1}