Built based on audit-v0.0-929-g39fdb2b_magic-8.3.47_2020-08-19_172600_0000 (without src)
diff --git a/libraries/sky130_fd_pr/v0.10.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice b/libraries/sky130_fd_pr/v0.10.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
index 9fa3cd1..cfdb637 100644
--- a/libraries/sky130_fd_pr/v0.10.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
+++ b/libraries/sky130_fd_pr/v0.10.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
@@ -16,4 +16,5 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7 M5A C1 C0 SUB
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x_0 C0 C1 M5A SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x
.ends
diff --git a/libraries/sky130_fd_pr/v0.10.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice b/libraries/sky130_fd_pr/v0.10.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
index a4147ef..8321134 100644
--- a/libraries/sky130_fd_pr/v0.10.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
+++ b/libraries/sky130_fd_pr/v0.10.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
@@ -15,7 +15,7 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C1 C0 MET5
+.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C0 C1 MET5
X0 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
X1 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
.ends
diff --git a/libraries/sky130_fd_pr/v0.10.1/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice b/libraries/sky130_fd_pr/v0.10.1/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
index 9864e88..6c7cdc5 100644
--- a/libraries/sky130_fd_pr/v0.10.1/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
+++ b/libraries/sky130_fd_pr/v0.10.1/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
@@ -19,16 +19,6 @@
X0 Drain Gate Source BULK sky130_fd_pr__pfet_01v8 w=3e+06u l=150000u
X1 Source Gate Drain BULK sky130_fd_pr__pfet_01v8 w=3e+06u l=150000u
.ends
-.subckt sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15 SUBSTRATE Source Drain Gate
-X0 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X1 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X2 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X3 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X4 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X5 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X6 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X7 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-.ends
.subckt sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15 BULK Source Drain $SUB Gate
X0 Drain Gate Source BULK sky130_fd_pr__pfet_01v8 w=840000u l=150000u
X1 Source Gate Drain BULK sky130_fd_pr__pfet_01v8 w=840000u l=150000u
@@ -40,7 +30,6 @@
.subckt sky130_fd_pr__aura_blocking D_N2 G_N2 S G_P2 S_P2 S_P G G_P S_N2 D_P2 VPWR
+ D_P VGND NWELL B_P
Xsky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15_0 B_P S_P2 D_P2 $SUB G_P2 sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15
-Xsky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_0 $SUB S_N2 D_N2 G_N2 sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15
Xsky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15_0 B_P S_P D_P $SUB G_P sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15
Xsky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15_0 $SUB S VPWR G sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15
.ends
diff --git a/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice b/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
index b84f983..b854b33 100644
--- a/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
+++ b/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top SUB C0 C1 M4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
.ends
diff --git a/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6.spice b/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6.spice
index fa760a9..423eefc 100644
--- a/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6.spice
+++ b/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6.spice
@@ -16,4 +16,5 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6 M5A C1 C0 SUB
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x_0 C0 C1 M5A SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x
.ends
diff --git a/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x8.spice b/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x8.spice
index dd3531a..e7b675e 100644
--- a/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x8.spice
+++ b/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x8.spice
@@ -16,4 +16,5 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x8 M5A C1 C0 SUB
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x_0 C0 C1 M5A SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x
.ends
diff --git a/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4.spice b/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4.spice
index 749a9df..0f054ef 100644
--- a/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4.spice
+++ b/libraries/sky130_fd_pr/v0.10.1/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4.spice
@@ -15,5 +15,5 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4 C0 C1 MET5 SUB
-.ends
+* Top level circuit sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+.end
diff --git a/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice b/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
index 2fdc3e7..179dc75 100644
--- a/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
+++ b/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top SUB C0 C1 M4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
.ends
diff --git a/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4.spice b/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4.spice
index 07f168e..684d293 100644
--- a/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4.spice
+++ b/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4.spice
@@ -15,5 +15,5 @@
* SPDX-License-Identifier: Apache-2.0
-* Top level circuit sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
-.end
+.subckt sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4 C0 C1 MET5 SUB
+.ends
diff --git a/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice b/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
index 9fa3cd1..cfdb637 100644
--- a/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
+++ b/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
@@ -16,4 +16,5 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7 M5A C1 C0 SUB
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x_0 C0 C1 M5A SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x
.ends
diff --git a/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice b/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
index bb9bf29..9ff103b 100644
--- a/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
+++ b/libraries/sky130_fd_pr/v0.11.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top M5 SUB C0 C1
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|0] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|0] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|1] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|1] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
.ends
diff --git a/libraries/sky130_fd_pr/v0.11.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice b/libraries/sky130_fd_pr/v0.11.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
index 8321134..a4147ef 100644
--- a/libraries/sky130_fd_pr/v0.11.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
+++ b/libraries/sky130_fd_pr/v0.11.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
@@ -15,7 +15,7 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C0 C1 MET5
+.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C1 C0 MET5
X0 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
X1 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
.ends
diff --git a/libraries/sky130_fd_pr/v0.11.0/cells/rf_pfdrc_proxy/sky130_fd_pr__rf_pfdrc_proxy.spice b/libraries/sky130_fd_pr/v0.11.0/cells/rf_pfdrc_proxy/sky130_fd_pr__rf_pfdrc_proxy.spice
index bd1bbcb..11f9d12 100644
--- a/libraries/sky130_fd_pr/v0.11.0/cells/rf_pfdrc_proxy/sky130_fd_pr__rf_pfdrc_proxy.spice
+++ b/libraries/sky130_fd_pr/v0.11.0/cells/rf_pfdrc_proxy/sky130_fd_pr__rf_pfdrc_proxy.spice
@@ -15,10 +15,5 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__rf_npn_11v0_W1p00L1p00 E B C $SUB
-X0 E E E $SUB sky130_fd_pr__nfet_g5v0d10v5 w=3e+06u l=3.52e+06u
-.ends
* Top level circuit sky130_fd_pr__rf_pfdrc_proxy
-Xsky130_fd_pr__rf_npn_11v0_W1p00L1p00_0 sky130_fd_pr__rf_npn_11v0_W1p00L1p00_0/E sky130_fd_pr__rf_npn_11v0_W1p00L1p00_0/B
-+ sky130_fd_pr__rf_npn_11v0_W1p00L1p00_0/C $SUB sky130_fd_pr__rf_npn_11v0_W1p00L1p00
.end
diff --git a/libraries/sky130_fd_pr/v0.12.0/cells/aura_drc_flag_check/sky130_fd_pr__aura_drc_flag_check.spice b/libraries/sky130_fd_pr/v0.12.0/cells/aura_drc_flag_check/sky130_fd_pr__aura_drc_flag_check.spice
index 9de6474..cfd999b 100644
--- a/libraries/sky130_fd_pr/v0.12.0/cells/aura_drc_flag_check/sky130_fd_pr__aura_drc_flag_check.spice
+++ b/libraries/sky130_fd_pr/v0.12.0/cells/aura_drc_flag_check/sky130_fd_pr__aura_drc_flag_check.spice
@@ -15,12 +15,6 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15 SUBSTRATE Gate
-X0 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=840000u l=150000u
-X1 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=840000u l=150000u
-X2 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=840000u l=150000u
-X3 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=840000u l=150000u
-.ends
.subckt sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15 SUBSTRATE Gate
X0 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
X1 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
@@ -50,8 +44,6 @@
X1 Source Gate Drain BULK sky130_fd_pr__pfet_01v8 w=5e+06u l=150000u
.ends
.subckt sky130_fd_pr__aura_drc_flag_check VGND NWELL B_P
-Xsky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15_1 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15_1/Gate
-+ sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15
Xsky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_0 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_0/Gate
+ sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15
Xsky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_1 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_1/Gate
@@ -92,6 +84,4 @@
+ sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15
Xsky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15_5 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15_5/Gate
+ sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15
-Xsky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15_0 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15_1/Gate
-+ sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15
.ends
diff --git a/libraries/sky130_fd_pr/v0.12.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice b/libraries/sky130_fd_pr/v0.12.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
index 0c1790f..b854b33 100644
--- a/libraries/sky130_fd_pr/v0.12.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
+++ b/libraries/sky130_fd_pr/v0.12.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
@@ -16,4 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top SUB C0 C1 M4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
.ends
diff --git a/libraries/sky130_fd_pr/v0.12.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice b/libraries/sky130_fd_pr/v0.12.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
index 9ff103b..bb9bf29 100644
--- a/libraries/sky130_fd_pr/v0.12.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
+++ b/libraries/sky130_fd_pr/v0.12.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top M5 SUB C0 C1
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|0] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|0] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|1] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|1] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
.ends
diff --git a/libraries/sky130_fd_pr/v0.12.0/cells/xcmvppx4_2xnhvnative10x4_top/sky130_fd_pr__xcmvppx4_2xnhvnative10x4_top.spice b/libraries/sky130_fd_pr/v0.12.0/cells/xcmvppx4_2xnhvnative10x4_top/sky130_fd_pr__xcmvppx4_2xnhvnative10x4_top.spice
index 4e1be3c..cafb4d2 100644
--- a/libraries/sky130_fd_pr/v0.12.0/cells/xcmvppx4_2xnhvnative10x4_top/sky130_fd_pr__xcmvppx4_2xnhvnative10x4_top.spice
+++ b/libraries/sky130_fd_pr/v0.12.0/cells/xcmvppx4_2xnhvnative10x4_top/sky130_fd_pr__xcmvppx4_2xnhvnative10x4_top.spice
@@ -15,13 +15,13 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C0 C1 MET5
+.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C1 C0 MET5
X0 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
X1 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
.ends
.subckt sky130_fd_pr__xcmvppx4_2xnhvnative10x4_top M5 C0 SUB
-Xsky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4_0[0|0] C0 SUB M5 sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4
-Xsky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4_0[1|0] C0 SUB M5 sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4
-Xsky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4_0[0|1] C0 SUB M5 sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4
-Xsky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4_0[1|1] C0 SUB M5 sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4
+Xsky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4_0[0|0] SUB C0 M5 sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4
+Xsky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4_0[1|0] SUB C0 M5 sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4
+Xsky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4_0[0|1] SUB C0 M5 sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4
+Xsky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4_0[1|1] SUB C0 M5 sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4
.ends
diff --git a/libraries/sky130_fd_pr/v0.12.1/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice b/libraries/sky130_fd_pr/v0.12.1/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
index f07e6dc..8321134 100644
--- a/libraries/sky130_fd_pr/v0.12.1/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
+++ b/libraries/sky130_fd_pr/v0.12.1/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
@@ -15,7 +15,7 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C1
-X0 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=2000 l=800
-X1 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=2000 l=800
+.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C0 C1 MET5
+X0 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
+X1 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
.ends
diff --git a/libraries/sky130_fd_pr/v0.13.0/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice b/libraries/sky130_fd_pr/v0.13.0/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
index 6c7cdc5..9864e88 100644
--- a/libraries/sky130_fd_pr/v0.13.0/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
+++ b/libraries/sky130_fd_pr/v0.13.0/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
@@ -19,6 +19,16 @@
X0 Drain Gate Source BULK sky130_fd_pr__pfet_01v8 w=3e+06u l=150000u
X1 Source Gate Drain BULK sky130_fd_pr__pfet_01v8 w=3e+06u l=150000u
.ends
+.subckt sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15 SUBSTRATE Source Drain Gate
+X0 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X1 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X2 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X3 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X4 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X5 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X6 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X7 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+.ends
.subckt sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15 BULK Source Drain $SUB Gate
X0 Drain Gate Source BULK sky130_fd_pr__pfet_01v8 w=840000u l=150000u
X1 Source Gate Drain BULK sky130_fd_pr__pfet_01v8 w=840000u l=150000u
@@ -30,6 +40,7 @@
.subckt sky130_fd_pr__aura_blocking D_N2 G_N2 S G_P2 S_P2 S_P G G_P S_N2 D_P2 VPWR
+ D_P VGND NWELL B_P
Xsky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15_0 B_P S_P2 D_P2 $SUB G_P2 sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15
+Xsky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_0 $SUB S_N2 D_N2 G_N2 sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15
Xsky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15_0 B_P S_P D_P $SUB G_P sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15
Xsky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15_0 $SUB S VPWR G sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15
.ends
diff --git a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top.spice b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top.spice
index 388c1a1..6f32ec7 100644
--- a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top.spice
+++ b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top M5 SUB C0 C1
-Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[0|0] M5 C0 C1 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[1|0] M5 C0 C1 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[0|1] M5 C0 C1 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[1|1] M5 C0 C1 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
.ends
diff --git a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
index 179dc75..2fdc3e7 100644
--- a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
+++ b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top SUB C0 C1 M4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
.ends
diff --git a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
index b854b33..b84f983 100644
--- a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
+++ b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top SUB C0 C1 M4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
.ends
diff --git a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top.spice b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top.spice
index 2057147..4ca524f 100644
--- a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top.spice
+++ b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top M5 SUB C0 C1
-Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[0|0] M5 SUB C0 C1 sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[1|0] M5 SUB C0 C1 sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[0|1] M5 SUB C0 C1 sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[1|1] M5 SUB C0 C1 sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
.ends
diff --git a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
index cfdb637..9fa3cd1 100644
--- a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
+++ b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
@@ -16,5 +16,4 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7 M5A C1 C0 SUB
-Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x_0 C0 C1 M5A SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x
.ends
diff --git a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
index bb9bf29..9ff103b 100644
--- a/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
+++ b/libraries/sky130_fd_pr/v0.13.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top M5 SUB C0 C1
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|0] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|0] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|1] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|1] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
.ends
diff --git a/libraries/sky130_fd_pr/v0.13.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice b/libraries/sky130_fd_pr/v0.13.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
index 8321134..a4147ef 100644
--- a/libraries/sky130_fd_pr/v0.13.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
+++ b/libraries/sky130_fd_pr/v0.13.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
@@ -15,7 +15,7 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C0 C1 MET5
+.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C1 C0 MET5
X0 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
X1 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top.spice b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top.spice
index 388c1a1..6f32ec7 100644
--- a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top.spice
+++ b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_top M5 SUB C0 C1
-Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[0|0] M5 C0 C1 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[1|0] M5 C0 C1 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[0|1] M5 C0 C1 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4_0[1|1] M5 C0 C1 SUB sky130_fd_pr__cap_vpp_04p4x04p6_m1m2m3_shieldl1m5_floatm4
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
index b854b33..b84f983 100644
--- a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
+++ b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_06p8x06p1_m1m2m3_shieldl1m4/sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_top SUB C0 C1 M4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[0|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4_0[1|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_m1m2m3_shieldl1m4
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top.spice b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top.spice
index 2057147..4ca524f 100644
--- a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top.spice
+++ b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_top M5 SUB C0 C1
-Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[0|0] M5 SUB C0 C1 sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[1|0] M5 SUB C0 C1 sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[0|1] M5 SUB C0 C1 sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[1|1] M5 SUB C0 C1 sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_08p6x07p9_m1m2m3_shieldl1m5_floatm4
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_top.spice b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_top.spice
index f990105..1c69d4d 100644
--- a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_top.spice
+++ b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_top SUB C0 C1 M4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_0[0|0] C1 C0 M4 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_0[1|0] C1 C0 M4 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_0[0|1] C1 C0 M4 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_0[1|1] C1 C0 M4 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_0[0|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_0[1|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_0[0|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4_0[1|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3_shieldpom4
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
index cfdb637..9fa3cd1 100644
--- a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
+++ b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7.spice
@@ -16,5 +16,4 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x7 M5A C1 C0 SUB
-Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x_0 C0 C1 M5A SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x9.spice b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x9.spice
index 7a2b8ed..31a4412 100644
--- a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x9.spice
+++ b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x9.spice
@@ -16,5 +16,4 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x9 M5A C1 C0 SUB
-Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x_0 C0 C1 M5A SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
index 9ff103b..bb9bf29 100644
--- a/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
+++ b/libraries/sky130_fd_pr/v0.20.0/cells/cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_top M5 SUB C0 C1
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
-Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|0] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|0] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[0|1] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
+Xsky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4_0[1|1] M5 C1 C0 SUB sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3_shieldl1m5_floatm4
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice b/libraries/sky130_fd_pr/v0.20.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
index f07e6dc..8321134 100644
--- a/libraries/sky130_fd_pr/v0.20.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
+++ b/libraries/sky130_fd_pr/v0.20.0/cells/rf2_xcmvppx4_2xnhvnative10x4/sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4.spice
@@ -15,7 +15,7 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C1
-X0 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=2000 l=800
-X1 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=2000 l=800
+.subckt sky130_fd_pr__rf2_xcmvppx4_2xnhvnative10x4 C0 C1 MET5
+X0 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
+X1 C1 C0 C1 C1 sky130_fd_pr__nfet_05v0_nvt w=1e+07u l=4e+06u
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.1/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice b/libraries/sky130_fd_pr/v0.20.1/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
index 9864e88..6c7cdc5 100644
--- a/libraries/sky130_fd_pr/v0.20.1/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
+++ b/libraries/sky130_fd_pr/v0.20.1/cells/aura_blocking/sky130_fd_pr__aura_blocking.spice
@@ -19,16 +19,6 @@
X0 Drain Gate Source BULK sky130_fd_pr__pfet_01v8 w=3e+06u l=150000u
X1 Source Gate Drain BULK sky130_fd_pr__pfet_01v8 w=3e+06u l=150000u
.ends
-.subckt sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15 SUBSTRATE Source Drain Gate
-X0 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X1 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X2 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X3 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X4 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X5 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X6 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-X7 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
-.ends
.subckt sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15 BULK Source Drain $SUB Gate
X0 Drain Gate Source BULK sky130_fd_pr__pfet_01v8 w=840000u l=150000u
X1 Source Gate Drain BULK sky130_fd_pr__pfet_01v8 w=840000u l=150000u
@@ -40,7 +30,6 @@
.subckt sky130_fd_pr__aura_blocking D_N2 G_N2 S G_P2 S_P2 S_P G G_P S_N2 D_P2 VPWR
+ D_P VGND NWELL B_P
Xsky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15_0 B_P S_P2 D_P2 $SUB G_P2 sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15
-Xsky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_0 $SUB S_N2 D_N2 G_N2 sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15
Xsky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15_0 B_P S_P D_P $SUB G_P sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15
Xsky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15_0 $SUB S VPWR G sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.1/cells/aura_drc_flag_check/sky130_fd_pr__aura_drc_flag_check.spice b/libraries/sky130_fd_pr/v0.20.1/cells/aura_drc_flag_check/sky130_fd_pr__aura_drc_flag_check.spice
index c29e048..9de6474 100644
--- a/libraries/sky130_fd_pr/v0.20.1/cells/aura_drc_flag_check/sky130_fd_pr__aura_drc_flag_check.spice
+++ b/libraries/sky130_fd_pr/v0.20.1/cells/aura_drc_flag_check/sky130_fd_pr__aura_drc_flag_check.spice
@@ -21,6 +21,16 @@
X2 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=840000u l=150000u
X3 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=840000u l=150000u
.ends
+.subckt sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15 SUBSTRATE Gate
+X0 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X1 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X2 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X3 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X4 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X5 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X6 Source Gate Drain SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+X7 Drain Gate Source SUBSTRATE sky130_fd_pr__nfet_01v8_lvt w=3e+06u l=150000u
+.ends
.subckt sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15 BULK $SUB Gate
X0 Drain Gate Source BULK sky130_fd_pr__pfet_01v8 w=1.68e+06u l=150000u
X1 Source Gate Drain BULK sky130_fd_pr__pfet_01v8 w=1.68e+06u l=150000u
@@ -42,6 +52,12 @@
.subckt sky130_fd_pr__aura_drc_flag_check VGND NWELL B_P
Xsky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15_1 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15_1/Gate
+ sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15
+Xsky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_0 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_0/Gate
++ sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15
+Xsky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_1 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_1/Gate
++ sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15
+Xsky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_2 $SUB sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15_2/Gate
++ sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15
Xsky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15_0 B_P $SUB sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15_0/Gate
+ sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15
Xsky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15_1 B_P $SUB sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15_2/Gate
diff --git a/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice b/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
index 2fdc3e7..179dc75 100644
--- a/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
+++ b/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4/sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top.spice
@@ -16,8 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_top SUB C0 C1 M4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|0] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
-Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|1] C0 C1 M4 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|0] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[0|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
+Xsky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4_0[1|1] M4 C0 C1 SUB sky130_fd_pr__cap_vpp_06p8x06p1_l1m1m2m3_shieldpom4
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_top.spice b/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_top.spice
index e22d1bc..d9d864a 100644
--- a/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_top.spice
+++ b/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_top.spice
@@ -16,4 +16,8 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_top M5 SUB C0 C1
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_0[0|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_0[1|0] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_0[0|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_0[1|1] C0 C1 M5 SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6.spice b/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6.spice
index fa760a9..423eefc 100644
--- a/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6.spice
+++ b/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5/sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6.spice
@@ -16,4 +16,5 @@
.subckt sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x6 M5A C1 C0 SUB
+Xsky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x_0 C0 C1 M5A SUB sky130_fd_pr__cap_vpp_11p5x11p7_l1m1m2m3m4_shieldpom5_x
.ends
diff --git a/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5.spice b/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5.spice
index 25a03c9..293f366 100644
--- a/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5.spice
+++ b/libraries/sky130_fd_pr/v0.20.1/cells/cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5/sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5.spice
@@ -15,5 +15,5 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5 C0 C1 MET5 SUB
-.ends
+* Top level circuit sky130_fd_pr__cap_vpp_11p5x11p7_m1m2m3m4_shieldl1m5
+.end
diff --git a/libraries/sky130_fd_sc_hd/v0.0.2/cells/nand2/sky130_fd_sc_hd__nand2_2.spice b/libraries/sky130_fd_sc_hd/v0.0.2/cells/nand2/sky130_fd_sc_hd__nand2_2.spice
index 04113c0..d4ae60f 100644
--- a/libraries/sky130_fd_sc_hd/v0.0.2/cells/nand2/sky130_fd_sc_hd__nand2_2.spice
+++ b/libraries/sky130_fd_sc_hd/v0.0.2/cells/nand2/sky130_fd_sc_hd__nand2_2.spice
@@ -15,13 +15,5 @@
* SPDX-License-Identifier: Apache-2.0
-.subckt sky130_fd_sc_hd__nand2_2 A B VGND VNB VPB VPWR Y
-X0 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
-X1 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
-X2 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
-X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
-X4 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
-X5 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
-X6 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
-X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
-.ends
+* Top level circuit sky130_fd_sc_hd__nand2_2
+.end
