diff --git a/sky130/irsim/header.txt b/sky130/irsim/header.txt
index 8ccf137..cb30654 100644
--- a/sky130/irsim/header.txt
+++ b/sky130/irsim/header.txt
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35    320
+device resistor sky130_fd_pr__res_high_po_0p69    320
+device resistor sky130_fd_pr__res_high_po_1p41    320
+device resistor sky130_fd_pr__res_high_po_2p85    320
+device resistor sky130_fd_pr__res_high_po_5p73    320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35  2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69  2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41  2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85  2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73  2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd      120
+device resistor sky130_fd_pr__res_generic_pd      197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_high_125.prm b/sky130/irsim/sky130_ff_high_125.prm
index ce1acfc..2cc55fb 100644
--- a/sky130/irsim/sky130_ff_high_125.prm
+++ b/sky130/irsim/sky130_ff_high_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_high_27.prm b/sky130/irsim/sky130_ff_high_27.prm
index 590bc51..f8f2220 100644
--- a/sky130/irsim/sky130_ff_high_27.prm
+++ b/sky130/irsim/sky130_ff_high_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_high_n40.prm b/sky130/irsim/sky130_ff_high_n40.prm
index 6e293a4..e38d4e1 100644
--- a/sky130/irsim/sky130_ff_high_n40.prm
+++ b/sky130/irsim/sky130_ff_high_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_low_125.prm b/sky130/irsim/sky130_ff_low_125.prm
index 12c18d8..2e93b0b 100644
--- a/sky130/irsim/sky130_ff_low_125.prm
+++ b/sky130/irsim/sky130_ff_low_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_low_27.prm b/sky130/irsim/sky130_ff_low_27.prm
index 215e421..4bd736c 100644
--- a/sky130/irsim/sky130_ff_low_27.prm
+++ b/sky130/irsim/sky130_ff_low_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_low_n40.prm b/sky130/irsim/sky130_ff_low_n40.prm
index aba2d98..b2b0aea 100644
--- a/sky130/irsim/sky130_ff_low_n40.prm
+++ b/sky130/irsim/sky130_ff_low_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_nom_125.prm b/sky130/irsim/sky130_ff_nom_125.prm
index 8ce7c63..4ab3dcc 100644
--- a/sky130/irsim/sky130_ff_nom_125.prm
+++ b/sky130/irsim/sky130_ff_nom_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_nom_27.prm b/sky130/irsim/sky130_ff_nom_27.prm
index fabcc78..3f66bd0 100644
--- a/sky130/irsim/sky130_ff_nom_27.prm
+++ b/sky130/irsim/sky130_ff_nom_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ff_nom_n40.prm b/sky130/irsim/sky130_ff_nom_n40.prm
index a29f5ef..84805ac 100644
--- a/sky130/irsim/sky130_ff_nom_n40.prm
+++ b/sky130/irsim/sky130_ff_nom_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_high_125.prm b/sky130/irsim/sky130_ss_high_125.prm
index 85439fd..bf48e69 100644
--- a/sky130/irsim/sky130_ss_high_125.prm
+++ b/sky130/irsim/sky130_ss_high_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_high_27.prm b/sky130/irsim/sky130_ss_high_27.prm
index 3d8a298..5211df6 100644
--- a/sky130/irsim/sky130_ss_high_27.prm
+++ b/sky130/irsim/sky130_ss_high_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_high_n40.prm b/sky130/irsim/sky130_ss_high_n40.prm
index 9671d07..b68a890 100644
--- a/sky130/irsim/sky130_ss_high_n40.prm
+++ b/sky130/irsim/sky130_ss_high_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_low_125.prm b/sky130/irsim/sky130_ss_low_125.prm
index 2a2d0bb..b5bb465 100644
--- a/sky130/irsim/sky130_ss_low_125.prm
+++ b/sky130/irsim/sky130_ss_low_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_low_27.prm b/sky130/irsim/sky130_ss_low_27.prm
index b21c4de..5433104 100644
--- a/sky130/irsim/sky130_ss_low_27.prm
+++ b/sky130/irsim/sky130_ss_low_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_low_n40.prm b/sky130/irsim/sky130_ss_low_n40.prm
index 80fccf9..b847519 100644
--- a/sky130/irsim/sky130_ss_low_n40.prm
+++ b/sky130/irsim/sky130_ss_low_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_nom_125.prm b/sky130/irsim/sky130_ss_nom_125.prm
index 1fe6d02..70d0f94 100644
--- a/sky130/irsim/sky130_ss_nom_125.prm
+++ b/sky130/irsim/sky130_ss_nom_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_nom_27.prm b/sky130/irsim/sky130_ss_nom_27.prm
index 7df95e2..334584a 100644
--- a/sky130/irsim/sky130_ss_nom_27.prm
+++ b/sky130/irsim/sky130_ss_nom_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_ss_nom_n40.prm b/sky130/irsim/sky130_ss_nom_n40.prm
index 031c724..c7397b1 100644
--- a/sky130/irsim/sky130_ss_nom_n40.prm
+++ b/sky130/irsim/sky130_ss_nom_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_high_125.prm b/sky130/irsim/sky130_tt_high_125.prm
index e25be2a..6fe92a6 100644
--- a/sky130/irsim/sky130_tt_high_125.prm
+++ b/sky130/irsim/sky130_tt_high_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_high_27.prm b/sky130/irsim/sky130_tt_high_27.prm
index dd4a60b..6a7d73d 100644
--- a/sky130/irsim/sky130_tt_high_27.prm
+++ b/sky130/irsim/sky130_tt_high_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_high_n40.prm b/sky130/irsim/sky130_tt_high_n40.prm
index 390e815..0ed87ed 100644
--- a/sky130/irsim/sky130_tt_high_n40.prm
+++ b/sky130/irsim/sky130_tt_high_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_low_125.prm b/sky130/irsim/sky130_tt_low_125.prm
index c333bc3..5f683be 100644
--- a/sky130/irsim/sky130_tt_low_125.prm
+++ b/sky130/irsim/sky130_tt_low_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_low_27.prm b/sky130/irsim/sky130_tt_low_27.prm
index 2320e98..b5eacc2 100644
--- a/sky130/irsim/sky130_tt_low_27.prm
+++ b/sky130/irsim/sky130_tt_low_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_low_n40.prm b/sky130/irsim/sky130_tt_low_n40.prm
index eaaa775..86334cb 100644
--- a/sky130/irsim/sky130_tt_low_n40.prm
+++ b/sky130/irsim/sky130_tt_low_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_nom_125.prm b/sky130/irsim/sky130_tt_nom_125.prm
index 53a4b88..e305e35 100644
--- a/sky130/irsim/sky130_tt_nom_125.prm
+++ b/sky130/irsim/sky130_tt_nom_125.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_nom_27.prm b/sky130/irsim/sky130_tt_nom_27.prm
index 5883070..883be02 100644
--- a/sky130/irsim/sky130_tt_nom_27.prm
+++ b/sky130/irsim/sky130_tt_nom_27.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/irsim/sky130_tt_nom_n40.prm b/sky130/irsim/sky130_tt_nom_n40.prm
index b964984..1bb9043 100644
--- a/sky130/irsim/sky130_tt_nom_n40.prm
+++ b/sky130/irsim/sky130_tt_nom_n40.prm
@@ -36,20 +36,20 @@
 device capacitor sky130_fd_pr__cap_mim_m3_2 2.0E-7
 
 ; Resistor values are in ohms/square
-device resistor sky130_res_high_po_0p35   320
-device resistor sky130_res_high_po_0p69   320
-device resistor sky130_res_high_po_1p41   320
-device resistor sky130_res_high_po_2p85   320
-device resistor sky130_res_high_po_5p73   320
-device resistor sky130_res_high_po	  320
-device resistor sky130_res_xhigh_po_0p35 2000
-device resistor sky130_res_xhigh_po_0p69 2000
-device resistor sky130_res_xhigh_po_1p41 2000
-device resistor sky130_res_xhigh_po_2p85 2000
-device resistor sky130_res_xhigh_po_5p73 2000
-device resistor sky130_res_xhigh_po	 2000
-device resistor sky130_res_generic_nd     120
-device resistor sky130_res_generic_pd     197
+device resistor sky130_fd_pr__res_high_po_0p35   320
+device resistor sky130_fd_pr__res_high_po_0p69   320
+device resistor sky130_fd_pr__res_high_po_1p41   320
+device resistor sky130_fd_pr__res_high_po_2p85   320
+device resistor sky130_fd_pr__res_high_po_5p73   320
+device resistor sky130_fd_pr__res_high_po	  320
+device resistor sky130_fd_pr__res_xhigh_po_0p35 2000
+device resistor sky130_fd_pr__res_xhigh_po_0p69 2000
+device resistor sky130_fd_pr__res_xhigh_po_1p41 2000
+device resistor sky130_fd_pr__res_xhigh_po_2p85 2000
+device resistor sky130_fd_pr__res_xhigh_po_5p73 2000
+device resistor sky130_fd_pr__res_xhigh_po	 2000
+device resistor sky130_fd_pr__res_generic_nd     120
+device resistor sky130_fd_pr__res_generic_pd     197
 
 ; Diode
 device diode sky130_fd_pr__diode_pw2nd_05v5
diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index df1f908..f7d977b 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -57,7 +57,7 @@
 # sky130_fd_pr__nfet_03v3_nvt	nnfet		native nFET
 # sky130_fd_pr__pfet_g5v0d10v5	mvpfet		thickox pFET
 # sky130_fd_pr__nfet_g5v0d10v5	mvnfet		thickox nFET
-# sky130_fd_pr__nfet_01v8_nvt	mvnnfet		thickox native nFET
+# sky130_fd_pr__nfet_05v0_nvt	mvnnfet		thickox native nFET
 # sky130_fd_pr__nfet_g5v0d16v0	mvnfet		extended-drain nFET***
 # sky130_fd_pr__pfet_g5v0d16v0	mvpfet		extended-drain pFET***
 # sky130_fd_pr__diode_pw2nd_05v5 ndiode		n+ diff diode