verilog: Fixing usage of cell reserved word.

`cell` is a Verilog reserved word.

Signed-off-by: Tim 'mithro' Ansell <tansell@google.com>
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.v b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.v
index 1c8f590..a0f2a92 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.v
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.v b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.v
index ec9525d..9cc9f86 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.v
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.v b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.v
index 76dade8..04a36d8 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.v
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.v b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.v
index faf59a6..bd55bd4 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.v
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.v b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.v
index 79420a0..64c1a2d 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.v
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.v b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.v
index 42fd78a..abcc006 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.v
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111o cell (
+    sky130_fd_sc_lp__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.v b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.v
index 5038c3b..0d253e7 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.v
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.v b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.v
index 40d586a..f6ce2f9 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.v
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.v b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.v
index 9370356..0f1051a 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.v
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.v b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.v
index 522208b..0e2126a 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.v
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.v b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.v
index c39c408..2ab3885 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.v
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.v b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.v
index 1f570ce..4fd6204 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.v
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2111oi cell (
+    sky130_fd_sc_lp__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_0.v b/cells/a211o/sky130_fd_sc_lp__a211o_0.v
index 2caf38a..ff4d941 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_0.v
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_1.v b/cells/a211o/sky130_fd_sc_lp__a211o_1.v
index 7f57895..167cc65 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_1.v
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_2.v b/cells/a211o/sky130_fd_sc_lp__a211o_2.v
index 1262488..8d958ab 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_2.v
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_4.v b/cells/a211o/sky130_fd_sc_lp__a211o_4.v
index 1066551..d443d0d 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_4.v
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_lp.v b/cells/a211o/sky130_fd_sc_lp__a211o_lp.v
index 8512bd5..e4ef36a 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_lp.v
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_m.v b/cells/a211o/sky130_fd_sc_lp__a211o_m.v
index a6c4311..e2fdca7 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_m.v
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211o cell (
+    sky130_fd_sc_lp__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.v b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.v
index 9a102ba..99dd38a 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.v
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.v b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.v
index c3b9d9f..7c007df 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.v
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.v b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.v
index d6ddea9..a418351 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.v
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.v b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.v
index 648e68f..5898de4 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.v
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.v b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.v
index 6c9a973..5640b36 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.v
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.v b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.v
index dc71c22..bc50db3 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.v
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a211oi cell (
+    sky130_fd_sc_lp__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.v b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.v
index f441a4e..76e6a87 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.v
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.v b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.v
index 966924b..9003da2 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.v
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.v b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.v
index 2b80399..08dffa2 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.v
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.v b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.v
index 16483c0..469cf5d 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.v
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.v b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.v
index 0f7ab3d..47a5949 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.v
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.v b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.v
index 2ba5134..8d5e322 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.v
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21bo cell (
+    sky130_fd_sc_lp__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.v b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.v
index ae23c9c..782cf21 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.v
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.v b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.v
index d1c22cb..fe11853 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.v
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.v b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.v
index 59c33f3..3eb1c6b 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.v
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.v b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.v
index 2f34a3d..9293ff0 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.v
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.v b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.v
index 91b2b1b..1f64155 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.v
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.v b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.v
index 5ecfc66..9054916 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.v
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21boi cell (
+    sky130_fd_sc_lp__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_0.v b/cells/a21o/sky130_fd_sc_lp__a21o_0.v
index 66fe03d..57f61b3 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_0.v
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_1.v b/cells/a21o/sky130_fd_sc_lp__a21o_1.v
index c58e8e7..4cbac2c 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_1.v
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_2.v b/cells/a21o/sky130_fd_sc_lp__a21o_2.v
index 261e8bf..e0c585a 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_2.v
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_4.v b/cells/a21o/sky130_fd_sc_lp__a21o_4.v
index c7ec996..28eebc4 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_4.v
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_lp.v b/cells/a21o/sky130_fd_sc_lp__a21o_lp.v
index 160ba7b..ad93e09 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_lp.v
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_m.v b/cells/a21o/sky130_fd_sc_lp__a21o_m.v
index c946d08..db9bf41 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_m.v
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21o cell (
+    sky130_fd_sc_lp__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.v b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.v
index 7d8d058..06627c3 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.v
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.v b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.v
index ff7e83a..4575cea 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.v
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.v b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.v
index 9049aaa..231a723 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.v
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.v b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.v
index dfbab12..f89269d 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.v
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.v b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.v
index 9b314ef..5a33fe5 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.v
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.v b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.v
index 16f16e4..1f6eed2 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.v
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a21oi cell (
+    sky130_fd_sc_lp__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_0.v b/cells/a221o/sky130_fd_sc_lp__a221o_0.v
index 82ddfd8..52b9a0d 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_0.v
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_1.v b/cells/a221o/sky130_fd_sc_lp__a221o_1.v
index cd34332..e3f3809 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_1.v
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_2.v b/cells/a221o/sky130_fd_sc_lp__a221o_2.v
index 02523b2..14f713b 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_2.v
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_4.v b/cells/a221o/sky130_fd_sc_lp__a221o_4.v
index 781e9fb..c2162fc 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_4.v
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_lp.v b/cells/a221o/sky130_fd_sc_lp__a221o_lp.v
index 40909d4..3533067 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_lp.v
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_m.v b/cells/a221o/sky130_fd_sc_lp__a221o_m.v
index 82e1413..1c148b5 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_m.v
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221o cell (
+    sky130_fd_sc_lp__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.v b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.v
index 512fc08..5d11dcc 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.v
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.v b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.v
index 8e68ec8..60c2839 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.v
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.v b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.v
index ba99220..4c03a24 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.v
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.v b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.v
index 25f0c83..46cb470 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.v
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.v b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.v
index fab8ab7..675d211 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.v
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.v b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.v
index 8ef7a56..b6dd2b5 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.v
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a221oi cell (
+    sky130_fd_sc_lp__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_0.v b/cells/a22o/sky130_fd_sc_lp__a22o_0.v
index ecf141c..150f95a 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_0.v
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_1.v b/cells/a22o/sky130_fd_sc_lp__a22o_1.v
index 6a2cd5d..c204858 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_1.v
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_2.v b/cells/a22o/sky130_fd_sc_lp__a22o_2.v
index f3d2446..3693204 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_2.v
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_4.v b/cells/a22o/sky130_fd_sc_lp__a22o_4.v
index 2aa6547..8227879 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_4.v
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_lp.v b/cells/a22o/sky130_fd_sc_lp__a22o_lp.v
index cd5ed5e..0eae199 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_lp.v
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_m.v b/cells/a22o/sky130_fd_sc_lp__a22o_m.v
index b2113a4..6ae8223 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_m.v
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22o cell (
+    sky130_fd_sc_lp__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.v b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.v
index 13919b8..7d698d4 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.v
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.v b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.v
index 0035837..85024bb 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.v
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.v b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.v
index bbbe68c..a2b8271 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.v
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.v b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.v
index 6c3acc0..01227d8 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.v
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.v b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.v
index 9e07be4..4501965 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.v
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.v b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.v
index bcf6690..14faa24 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.v
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a22oi cell (
+    sky130_fd_sc_lp__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.v b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.v
index 0bc774d..b967a90 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.v
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.v b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.v
index 1b3cf41..4979c64 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.v
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.v b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.v
index 2de88ef..04b2cdc 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.v
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.v b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.v
index 8c3ce8d..3f4984c 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.v
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.v b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.v
index f31820d..e467a10 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.v
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.v b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.v
index fd424d0..99ec2b3 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.v
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2o cell (
+    sky130_fd_sc_lp__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.v b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.v
index b9e8002..9a7503d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.v
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.v b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.v
index fba837b..14270de 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.v
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.v b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.v
index 9704196..eae76cd 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.v
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.v b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.v
index e8103f7..217f6c8 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.v
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.v b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.v
index 165bc56..3ba73ff 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.v
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.v b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.v
index fe5b645..c9527ab 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.v
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a2bb2oi cell (
+    sky130_fd_sc_lp__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_0.v b/cells/a311o/sky130_fd_sc_lp__a311o_0.v
index 643664c..a45db6a 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_0.v
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_1.v b/cells/a311o/sky130_fd_sc_lp__a311o_1.v
index 27491f6..e6af660 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_1.v
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_2.v b/cells/a311o/sky130_fd_sc_lp__a311o_2.v
index cc9bd87..c523ecb 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_2.v
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_4.v b/cells/a311o/sky130_fd_sc_lp__a311o_4.v
index b3c5185..7850884 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_4.v
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_lp.v b/cells/a311o/sky130_fd_sc_lp__a311o_lp.v
index a633691..611ef33 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_lp.v
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_m.v b/cells/a311o/sky130_fd_sc_lp__a311o_m.v
index 60e24f9..dcf8d2e 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_m.v
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311o cell (
+    sky130_fd_sc_lp__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.v b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.v
index 4254801..4e6d311 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.v
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.v b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.v
index c0e1631..096a4ca 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.v
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.v b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.v
index 8496a85..ca7e106 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.v
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.v b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.v
index 9388b36..0386923 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.v
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.v b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.v
index d78f737..c4df75e 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.v
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.v b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.v
index d3689b8..dd21dec 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.v
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a311oi cell (
+    sky130_fd_sc_lp__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_0.v b/cells/a31o/sky130_fd_sc_lp__a31o_0.v
index 8d1ad31..d7fb240 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_0.v
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_1.v b/cells/a31o/sky130_fd_sc_lp__a31o_1.v
index 368a3b3..07ba008 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_1.v
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_2.v b/cells/a31o/sky130_fd_sc_lp__a31o_2.v
index 4e9730d..70ca73e 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_2.v
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_4.v b/cells/a31o/sky130_fd_sc_lp__a31o_4.v
index 5f49426..a477b74 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_4.v
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_lp.v b/cells/a31o/sky130_fd_sc_lp__a31o_lp.v
index 6d6ddfc..216d2bd 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_lp.v
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_m.v b/cells/a31o/sky130_fd_sc_lp__a31o_m.v
index d2f960a..e99ab8f 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_m.v
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31o cell (
+    sky130_fd_sc_lp__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.v b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.v
index 9f5c263..f5d6e0e 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.v
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.v b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.v
index 6c7ab08..f29d750 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.v
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.v b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.v
index 6163c85..bfff29e 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.v
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.v b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.v
index 327849c..07cce88 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.v
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.v b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.v
index 7ecc8ec..97f4dd7 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.v
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.v b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.v
index d3d7810..fa795ec 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.v
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a31oi cell (
+    sky130_fd_sc_lp__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_0.v b/cells/a32o/sky130_fd_sc_lp__a32o_0.v
index 996fa0d..121b5fb 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_0.v
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_0.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_1.v b/cells/a32o/sky130_fd_sc_lp__a32o_1.v
index 9afade6..405c70c 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_1.v
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_2.v b/cells/a32o/sky130_fd_sc_lp__a32o_2.v
index 778e40d..23e0c14 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_2.v
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_4.v b/cells/a32o/sky130_fd_sc_lp__a32o_4.v
index 03cd8ef..66b414e 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_4.v
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_lp.v b/cells/a32o/sky130_fd_sc_lp__a32o_lp.v
index 867f62f..f1045b0 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_lp.v
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_lp.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_m.v b/cells/a32o/sky130_fd_sc_lp__a32o_m.v
index a78d803..9587f54 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_m.v
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_m.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32o cell (
+    sky130_fd_sc_lp__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.v b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.v
index 67b610f..0d4675f 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.v
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.v b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.v
index 502cbf8..27ed18e 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.v
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.v b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.v
index efbfe73..ceef147 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.v
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.v b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.v
index 09597d2..b9f36bc 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.v
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.v b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.v
index 42f67b4..009b60f 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.v
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.v b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.v
index 07e4618..e1e5ab1 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.v
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a32oi cell (
+    sky130_fd_sc_lp__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_0.v b/cells/a41o/sky130_fd_sc_lp__a41o_0.v
index 4b68af7..2da457a 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_0.v
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_1.v b/cells/a41o/sky130_fd_sc_lp__a41o_1.v
index bcdff7f..320bdd5 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_1.v
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_2.v b/cells/a41o/sky130_fd_sc_lp__a41o_2.v
index ca6ae69..03b7dde 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_2.v
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_4.v b/cells/a41o/sky130_fd_sc_lp__a41o_4.v
index 11b8885..9bded25 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_4.v
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_lp.v b/cells/a41o/sky130_fd_sc_lp__a41o_lp.v
index 5d0eed5..d362f8f 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_lp.v
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_m.v b/cells/a41o/sky130_fd_sc_lp__a41o_m.v
index c982839..b61d46d 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_m.v
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41o cell (
+    sky130_fd_sc_lp__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.v b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.v
index 57c0bc8..b8cb1dc 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.v
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.v b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.v
index b96b417..7aa9805 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.v
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.v b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.v
index 4131fca..1db712b 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.v
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.v b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.v
index 881c573..22438c1 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.v
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.v b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.v
index 3458219..30cadd9 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.v
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.v b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.v
index c9432b7..91bbdbe 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.v
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__a41oi cell (
+    sky130_fd_sc_lp__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/and2/sky130_fd_sc_lp__and2_0.v b/cells/and2/sky130_fd_sc_lp__and2_0.v
index ea46a1d..dc80527 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_0.v
+++ b/cells/and2/sky130_fd_sc_lp__and2_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_lp__and2_1.v b/cells/and2/sky130_fd_sc_lp__and2_1.v
index 2d91758..a2069a8 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_1.v
+++ b/cells/and2/sky130_fd_sc_lp__and2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_lp__and2_2.v b/cells/and2/sky130_fd_sc_lp__and2_2.v
index 98f334c..239b82f 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_2.v
+++ b/cells/and2/sky130_fd_sc_lp__and2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_lp__and2_4.v b/cells/and2/sky130_fd_sc_lp__and2_4.v
index c7c7f58..d4951b1 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_4.v
+++ b/cells/and2/sky130_fd_sc_lp__and2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp.v b/cells/and2/sky130_fd_sc_lp__and2_lp.v
index 9aff365..9c1ccea 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp.v
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp2.v b/cells/and2/sky130_fd_sc_lp__and2_lp2.v
index 75d2f90..a8ee5b6 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp2.v
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_lp__and2_m.v b/cells/and2/sky130_fd_sc_lp__and2_m.v
index 39e713f..a4a5320 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_m.v
+++ b/cells/and2/sky130_fd_sc_lp__and2_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2 cell (
+    sky130_fd_sc_lp__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_1.v b/cells/and2b/sky130_fd_sc_lp__and2b_1.v
index ead99df..d693e2b 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_1.v
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_2.v b/cells/and2b/sky130_fd_sc_lp__and2b_2.v
index a69ee9b..3a1740b 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_2.v
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_4.v b/cells/and2b/sky130_fd_sc_lp__and2b_4.v
index c9a6e2d..7a6be46 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_4.v
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_lp.v b/cells/and2b/sky130_fd_sc_lp__and2b_lp.v
index 1c36053..ea0685c 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_lp.v
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_m.v b/cells/and2b/sky130_fd_sc_lp__and2b_m.v
index 956f3fc..79630b3 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_m.v
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and2b cell (
+    sky130_fd_sc_lp__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and3/sky130_fd_sc_lp__and3_0.v b/cells/and3/sky130_fd_sc_lp__and3_0.v
index 04cb494..18125dd 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_0.v
+++ b/cells/and3/sky130_fd_sc_lp__and3_0.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_lp__and3_1.v b/cells/and3/sky130_fd_sc_lp__and3_1.v
index 5adbc83..15b6198 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_1.v
+++ b/cells/and3/sky130_fd_sc_lp__and3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_lp__and3_2.v b/cells/and3/sky130_fd_sc_lp__and3_2.v
index d290712..25364b5 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_2.v
+++ b/cells/and3/sky130_fd_sc_lp__and3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_lp__and3_4.v b/cells/and3/sky130_fd_sc_lp__and3_4.v
index 5a4fdc8..429af41 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_4.v
+++ b/cells/and3/sky130_fd_sc_lp__and3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_lp__and3_lp.v b/cells/and3/sky130_fd_sc_lp__and3_lp.v
index faf6ffa..d6f6729 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_lp.v
+++ b/cells/and3/sky130_fd_sc_lp__and3_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_lp__and3_m.v b/cells/and3/sky130_fd_sc_lp__and3_m.v
index acc0beb..4edece8 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_m.v
+++ b/cells/and3/sky130_fd_sc_lp__and3_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3 cell (
+    sky130_fd_sc_lp__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_1.v b/cells/and3b/sky130_fd_sc_lp__and3b_1.v
index 40215ac..7c1fbad 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_1.v
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_2.v b/cells/and3b/sky130_fd_sc_lp__and3b_2.v
index e40f236..508cbe9 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_2.v
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_4.v b/cells/and3b/sky130_fd_sc_lp__and3b_4.v
index 7490661..f5a7f20 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_4.v
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_lp.v b/cells/and3b/sky130_fd_sc_lp__and3b_lp.v
index 948697c..1d9c4f6 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_lp.v
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_m.v b/cells/and3b/sky130_fd_sc_lp__and3b_m.v
index b59efd0..e829a7b 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_m.v
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and3b cell (
+    sky130_fd_sc_lp__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_lp__and4_0.v b/cells/and4/sky130_fd_sc_lp__and4_0.v
index 8d5cb03..95f69da 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_0.v
+++ b/cells/and4/sky130_fd_sc_lp__and4_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_lp__and4_1.v b/cells/and4/sky130_fd_sc_lp__and4_1.v
index a7c1ced..590e4f8 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_1.v
+++ b/cells/and4/sky130_fd_sc_lp__and4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_lp__and4_2.v b/cells/and4/sky130_fd_sc_lp__and4_2.v
index afe4473..0dd8c89 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_2.v
+++ b/cells/and4/sky130_fd_sc_lp__and4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_lp__and4_4.v b/cells/and4/sky130_fd_sc_lp__and4_4.v
index 3bc72eb..fbafd01 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_4.v
+++ b/cells/and4/sky130_fd_sc_lp__and4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp.v b/cells/and4/sky130_fd_sc_lp__and4_lp.v
index 0f233e1..4b65d31 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp.v
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp2.v b/cells/and4/sky130_fd_sc_lp__and4_lp2.v
index 2009fe0..b0d3b3e 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp2.v
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_lp__and4_m.v b/cells/and4/sky130_fd_sc_lp__and4_m.v
index 6be353f..9e671b6 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_m.v
+++ b/cells/and4/sky130_fd_sc_lp__and4_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4 cell (
+    sky130_fd_sc_lp__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_1.v b/cells/and4b/sky130_fd_sc_lp__and4b_1.v
index 470ae12..38a606f 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_1.v
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_2.v b/cells/and4b/sky130_fd_sc_lp__and4b_2.v
index 26bb2eb..6b3eb12 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_2.v
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_4.v b/cells/and4b/sky130_fd_sc_lp__and4b_4.v
index 73a94ce..edded5b 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_4.v
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_lp.v b/cells/and4b/sky130_fd_sc_lp__and4b_lp.v
index a1112d6..f9818f6 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_lp.v
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_m.v b/cells/and4b/sky130_fd_sc_lp__and4b_m.v
index adcaf35..6248c6c 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_m.v
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4b cell (
+    sky130_fd_sc_lp__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.v b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.v
index 38da49d..9c1063f 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.v
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.v b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.v
index 2962e23..9c4ae20 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.v
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.v b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.v
index 8bebeb6..aabef02 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.v
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.v b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.v
index 56c0dde..8901d98 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.v
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.v b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.v
index ea0d521..b310a93 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.v
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__and4bb cell (
+    sky130_fd_sc_lp__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/buf/sky130_fd_sc_lp__buf_0.v b/cells/buf/sky130_fd_sc_lp__buf_0.v
index b447c34..1b6bbb8 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_0.v
+++ b/cells/buf/sky130_fd_sc_lp__buf_0.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_lp__buf_1.v b/cells/buf/sky130_fd_sc_lp__buf_1.v
index 33c4847..96dd64f 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_1.v
+++ b/cells/buf/sky130_fd_sc_lp__buf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_lp__buf_16.v b/cells/buf/sky130_fd_sc_lp__buf_16.v
index 01fa91d..8c06358 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_16.v
+++ b/cells/buf/sky130_fd_sc_lp__buf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_lp__buf_2.v b/cells/buf/sky130_fd_sc_lp__buf_2.v
index ad12a52..3f79ecd 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_2.v
+++ b/cells/buf/sky130_fd_sc_lp__buf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_lp__buf_4.v b/cells/buf/sky130_fd_sc_lp__buf_4.v
index 17ef2e8..3403329 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_4.v
+++ b/cells/buf/sky130_fd_sc_lp__buf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_lp__buf_8.v b/cells/buf/sky130_fd_sc_lp__buf_8.v
index 02aab47..96b1851 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_8.v
+++ b/cells/buf/sky130_fd_sc_lp__buf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_lp__buf_lp.v b/cells/buf/sky130_fd_sc_lp__buf_lp.v
index 855424b..9e8dea9 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_lp.v
+++ b/cells/buf/sky130_fd_sc_lp__buf_lp.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_lp__buf_m.v b/cells/buf/sky130_fd_sc_lp__buf_m.v
index 65d22f6..d49b646 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_m.v
+++ b/cells/buf/sky130_fd_sc_lp__buf_m.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buf cell (
+    sky130_fd_sc_lp__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.v b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.v
index f7c7045..e65240c 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.v
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__bufbuf cell (
+    sky130_fd_sc_lp__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__bufbuf cell (
+    sky130_fd_sc_lp__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.v b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.v
index e64d61b..e7abe41 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.v
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__bufbuf cell (
+    sky130_fd_sc_lp__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__bufbuf cell (
+    sky130_fd_sc_lp__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.v b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.v
index d96238e..e2db209 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.v
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__bufinv cell (
+    sky130_fd_sc_lp__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__bufinv cell (
+    sky130_fd_sc_lp__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.v b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.v
index 746ed51..aebed4d 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.v
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__bufinv cell (
+    sky130_fd_sc_lp__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__bufinv cell (
+    sky130_fd_sc_lp__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.v b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.v
index 71edf06..481d175 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.v
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.v
@@ -53,7 +53,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__bufkapwr cell (
+    sky130_fd_sc_lp__bufkapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__bufkapwr cell (
+    sky130_fd_sc_lp__bufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.v b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.v
index 8e9fcd8..36edcdf 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.v
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.v
@@ -53,7 +53,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__bufkapwr cell (
+    sky130_fd_sc_lp__bufkapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__bufkapwr cell (
+    sky130_fd_sc_lp__bufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.v b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.v
index 8be1b64..fdbc04a 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.v
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.v
@@ -53,7 +53,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__bufkapwr cell (
+    sky130_fd_sc_lp__bufkapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__bufkapwr cell (
+    sky130_fd_sc_lp__bufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.v b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.v
index 98877eb..333da73 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.v
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.v
@@ -53,7 +53,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__bufkapwr cell (
+    sky130_fd_sc_lp__bufkapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__bufkapwr cell (
+    sky130_fd_sc_lp__bufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_0.v b/cells/buflp/sky130_fd_sc_lp__buflp_0.v
index dfee1b1..102e7c5 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_0.v
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_0.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_1.v b/cells/buflp/sky130_fd_sc_lp__buflp_1.v
index 1f920bc..ddbd727 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_1.v
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_2.v b/cells/buflp/sky130_fd_sc_lp__buflp_2.v
index 9c9807c..8e7f471 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_2.v
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_4.v b/cells/buflp/sky130_fd_sc_lp__buflp_4.v
index 3c1043a..09808a6 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_4.v
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_8.v b/cells/buflp/sky130_fd_sc_lp__buflp_8.v
index c3e1e1c..2b3de4f 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_8.v
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_m.v b/cells/buflp/sky130_fd_sc_lp__buflp_m.v
index 79764e6..24d3491 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_m.v
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_m.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__buflp cell (
+    sky130_fd_sc_lp__buflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.v b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.v
index 78460bb..882169c 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.v
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__busdriver cell (
+    sky130_fd_sc_lp__busdriver base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__busdriver cell (
+    sky130_fd_sc_lp__busdriver base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.v b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.v
index f8ad448..8bb4555 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.v
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__busdriver2 cell (
+    sky130_fd_sc_lp__busdriver2 base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__busdriver2 cell (
+    sky130_fd_sc_lp__busdriver2 base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.v b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.v
index 4fdd6e6..f41f98c 100644
--- a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.v
+++ b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.v
@@ -54,7 +54,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__busdrivernovlp cell (
+    sky130_fd_sc_lp__busdrivernovlp base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -96,7 +96,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__busdrivernovlp cell (
+    sky130_fd_sc_lp__busdrivernovlp base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.v b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.v
index a84e171..31cab29 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.v
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.v
@@ -54,7 +54,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__busdrivernovlp2 cell (
+    sky130_fd_sc_lp__busdrivernovlp2 base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -96,7 +96,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__busdrivernovlp2 cell (
+    sky130_fd_sc_lp__busdrivernovlp2 base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.v b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.v
index 22c2bfc..0f69c48 100644
--- a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.v
+++ b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.v
@@ -58,7 +58,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__busdrivernovlpsleep cell (
+    sky130_fd_sc_lp__busdrivernovlpsleep base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -107,7 +107,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__busdrivernovlpsleep cell (
+    sky130_fd_sc_lp__busdrivernovlpsleep base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
diff --git a/cells/bushold/sky130_fd_sc_lp__bushold_1.v b/cells/bushold/sky130_fd_sc_lp__bushold_1.v
index 757b5db..1cdeb65 100644
--- a/cells/bushold/sky130_fd_sc_lp__bushold_1.v
+++ b/cells/bushold/sky130_fd_sc_lp__bushold_1.v
@@ -52,7 +52,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__bushold cell (
+    sky130_fd_sc_lp__bushold base (
         .X(X),
         .RESET(RESET),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__bushold cell (
+    sky130_fd_sc_lp__bushold base (
         .X(X),
         .RESET(RESET)
     );
diff --git a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.v b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.v
index 9500e9e..da60f93 100644
--- a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.v
+++ b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.v
@@ -52,7 +52,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__bushold0 cell (
+    sky130_fd_sc_lp__bushold0 base (
         .X(X),
         .RESET(RESET),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__bushold0 cell (
+    sky130_fd_sc_lp__bushold0 base (
         .X(X),
         .RESET(RESET)
     );
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.v b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.v
index 4113026..7df0698 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.v
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__busreceiver cell (
+    sky130_fd_sc_lp__busreceiver base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__busreceiver cell (
+    sky130_fd_sc_lp__busreceiver base (
         .X(X),
         .A(A)
     );
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.v b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.v
index dd162dd..97a5f61 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.v
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__busreceiver cell (
+    sky130_fd_sc_lp__busreceiver base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__busreceiver cell (
+    sky130_fd_sc_lp__busreceiver base (
         .X(X),
         .A(A)
     );
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.v b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.v
index c57b250..0d92e14 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.v
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__busreceiver cell (
+    sky130_fd_sc_lp__busreceiver base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__busreceiver cell (
+    sky130_fd_sc_lp__busreceiver base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.v b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.v
index 142bc27..45136f5 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.v
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.v b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.v
index 25050d1..697ac01 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.v
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.v b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.v
index 35cfb81..bbf9782 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.v
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.v b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.v
index c8404fd..d97d91a 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.v
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.v b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.v
index d2c8ee3..cd5865a 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.v
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.v b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.v
index f2936a8..f49430a 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.v
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.v b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.v
index 4df2ccf..ac0e283 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.v
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuf cell (
+    sky130_fd_sc_lp__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.v b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.v
index 555cefa..f4f137d 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.v
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuflp cell (
+    sky130_fd_sc_lp__clkbuflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuflp cell (
+    sky130_fd_sc_lp__clkbuflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.v b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.v
index 7e181e2..0760879 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.v
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuflp cell (
+    sky130_fd_sc_lp__clkbuflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuflp cell (
+    sky130_fd_sc_lp__clkbuflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.v b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.v
index 5232431..7567b40 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.v
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuflp cell (
+    sky130_fd_sc_lp__clkbuflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuflp cell (
+    sky130_fd_sc_lp__clkbuflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.v b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.v
index 12f908a..8553001 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.v
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkbuflp cell (
+    sky130_fd_sc_lp__clkbuflp base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkbuflp cell (
+    sky130_fd_sc_lp__clkbuflp base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.v b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.v
index febbfd8..2736c21 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.v
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkdlybuf4s15 cell (
+    sky130_fd_sc_lp__clkdlybuf4s15 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkdlybuf4s15 cell (
+    sky130_fd_sc_lp__clkdlybuf4s15 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.v b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.v
index 4926d69..7aa468e 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.v
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkdlybuf4s15 cell (
+    sky130_fd_sc_lp__clkdlybuf4s15 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkdlybuf4s15 cell (
+    sky130_fd_sc_lp__clkdlybuf4s15 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.v b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.v
index 6b2f149..ecc7ac3 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.v
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkdlybuf4s18 cell (
+    sky130_fd_sc_lp__clkdlybuf4s18 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkdlybuf4s18 cell (
+    sky130_fd_sc_lp__clkdlybuf4s18 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.v b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.v
index 3634b5d..b5a4cf7 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.v
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkdlybuf4s18 cell (
+    sky130_fd_sc_lp__clkdlybuf4s18 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkdlybuf4s18 cell (
+    sky130_fd_sc_lp__clkdlybuf4s18 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.v b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.v
index e0a6dd2..beaf216 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.v
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkdlybuf4s25 cell (
+    sky130_fd_sc_lp__clkdlybuf4s25 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkdlybuf4s25 cell (
+    sky130_fd_sc_lp__clkdlybuf4s25 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.v b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.v
index 907fcb0..8799ab2 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.v
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkdlybuf4s25 cell (
+    sky130_fd_sc_lp__clkdlybuf4s25 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkdlybuf4s25 cell (
+    sky130_fd_sc_lp__clkdlybuf4s25 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.v b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.v
index e9aadce..41ba21c 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.v
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkdlybuf4s50 cell (
+    sky130_fd_sc_lp__clkdlybuf4s50 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkdlybuf4s50 cell (
+    sky130_fd_sc_lp__clkdlybuf4s50 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.v b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.v
index 7e149a5..a8863d2 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.v
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkdlybuf4s50 cell (
+    sky130_fd_sc_lp__clkdlybuf4s50 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkdlybuf4s50 cell (
+    sky130_fd_sc_lp__clkdlybuf4s50 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.v b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.v
index 97863e5..f59da63 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.v b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.v
index 44d9f11..82904a3 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.v b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.v
index 84d217e..67671e4 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.v b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.v
index 222f482..3ed2acc 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.v b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.v
index 2bbeab7..932ce5e 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.v b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.v
index c267509..b3cb004 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.v b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.v
index 1edcdd0..2dc033d 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.v b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.v
index 7622d99..ea8c79a 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinv cell (
+    sky130_fd_sc_lp__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.v b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.v
index 0c6584c..7b25957 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.v
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinvlp cell (
+    sky130_fd_sc_lp__clkinvlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinvlp cell (
+    sky130_fd_sc_lp__clkinvlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.v b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.v
index 3f8a8d0..8d32bed 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.v
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinvlp cell (
+    sky130_fd_sc_lp__clkinvlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinvlp cell (
+    sky130_fd_sc_lp__clkinvlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.v b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.v
index 4b66cc7..90f1133 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.v
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinvlp cell (
+    sky130_fd_sc_lp__clkinvlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinvlp cell (
+    sky130_fd_sc_lp__clkinvlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.v b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.v
index c2b1e33..0b96e2a 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.v
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__clkinvlp cell (
+    sky130_fd_sc_lp__clkinvlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__clkinvlp cell (
+    sky130_fd_sc_lp__clkinvlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/conb/sky130_fd_sc_lp__conb_0.v b/cells/conb/sky130_fd_sc_lp__conb_0.v
index 31395fe..956f599 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_0.v
+++ b/cells/conb/sky130_fd_sc_lp__conb_0.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__conb cell (
+    sky130_fd_sc_lp__conb base (
         .HI(HI),
         .LO(LO),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__conb cell (
+    sky130_fd_sc_lp__conb base (
         .HI(HI),
         .LO(LO)
     );
diff --git a/cells/conb/sky130_fd_sc_lp__conb_1.v b/cells/conb/sky130_fd_sc_lp__conb_1.v
index a33c82c..28ad2e4 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_1.v
+++ b/cells/conb/sky130_fd_sc_lp__conb_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__conb cell (
+    sky130_fd_sc_lp__conb base (
         .HI(HI),
         .LO(LO),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__conb cell (
+    sky130_fd_sc_lp__conb base (
         .HI(HI),
         .LO(LO)
     );
diff --git a/cells/decap/sky130_fd_sc_lp__decap_12.v b/cells/decap/sky130_fd_sc_lp__decap_12.v
index b1f2e00..ef74024 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_12.v
+++ b/cells/decap/sky130_fd_sc_lp__decap_12.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__decap cell (
+    sky130_fd_sc_lp__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__decap cell ();
+    sky130_fd_sc_lp__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_lp__decap_3.v b/cells/decap/sky130_fd_sc_lp__decap_3.v
index a844968..64292ce 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_3.v
+++ b/cells/decap/sky130_fd_sc_lp__decap_3.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__decap cell (
+    sky130_fd_sc_lp__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__decap cell ();
+    sky130_fd_sc_lp__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_lp__decap_4.v b/cells/decap/sky130_fd_sc_lp__decap_4.v
index 9b377b5..9f69ded 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_4.v
+++ b/cells/decap/sky130_fd_sc_lp__decap_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__decap cell (
+    sky130_fd_sc_lp__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__decap cell ();
+    sky130_fd_sc_lp__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_lp__decap_6.v b/cells/decap/sky130_fd_sc_lp__decap_6.v
index 6303caa..f54d514 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_6.v
+++ b/cells/decap/sky130_fd_sc_lp__decap_6.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__decap cell (
+    sky130_fd_sc_lp__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__decap cell ();
+    sky130_fd_sc_lp__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_lp__decap_8.v b/cells/decap/sky130_fd_sc_lp__decap_8.v
index b9f3693..3407ea3 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_8.v
+++ b/cells/decap/sky130_fd_sc_lp__decap_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__decap cell (
+    sky130_fd_sc_lp__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__decap cell ();
+    sky130_fd_sc_lp__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.v b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.v
index 15fb607..a337a9b 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.v
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__decapkapwr cell (
+    sky130_fd_sc_lp__decapkapwr base (
         .KAPWR(KAPWR),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -86,7 +86,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__decapkapwr cell ();
+    sky130_fd_sc_lp__decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.v b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.v
index 2f2499c..039de11 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.v
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__decapkapwr cell (
+    sky130_fd_sc_lp__decapkapwr base (
         .KAPWR(KAPWR),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -86,7 +86,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__decapkapwr cell ();
+    sky130_fd_sc_lp__decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.v b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.v
index d9e25b2..ed3926a 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.v
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__decapkapwr cell (
+    sky130_fd_sc_lp__decapkapwr base (
         .KAPWR(KAPWR),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -86,7 +86,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__decapkapwr cell ();
+    sky130_fd_sc_lp__decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.v b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.v
index f1eea6a..cdc455d 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.v
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__decapkapwr cell (
+    sky130_fd_sc_lp__decapkapwr base (
         .KAPWR(KAPWR),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -86,7 +86,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__decapkapwr cell ();
+    sky130_fd_sc_lp__decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.v b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.v
index dda3d28..799b574 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.v
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__decapkapwr cell (
+    sky130_fd_sc_lp__decapkapwr base (
         .KAPWR(KAPWR),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -86,7 +86,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__decapkapwr cell ();
+    sky130_fd_sc_lp__decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.v b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.v
index c3827a8..bb7a813 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.v
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfbbn cell (
+    sky130_fd_sc_lp__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfbbn cell (
+    sky130_fd_sc_lp__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.v b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.v
index 591c321..52f1ae3 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.v
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfbbn cell (
+    sky130_fd_sc_lp__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfbbn cell (
+    sky130_fd_sc_lp__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.v b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.v
index f4212b5..1cb7cbd 100644
--- a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.v
+++ b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfbbp cell (
+    sky130_fd_sc_lp__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfbbp cell (
+    sky130_fd_sc_lp__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.v b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.v
index 09b1fb9..9461b61 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.v
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfrbp cell (
+    sky130_fd_sc_lp__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfrbp cell (
+    sky130_fd_sc_lp__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.v b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.v
index 64ee7ba..7267205 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.v
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfrbp cell (
+    sky130_fd_sc_lp__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfrbp cell (
+    sky130_fd_sc_lp__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.v b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.v
index eeee78d..82badca 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.v
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfrbp cell (
+    sky130_fd_sc_lp__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfrbp cell (
+    sky130_fd_sc_lp__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.v b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.v
index d7a2d3d..44076b4 100644
--- a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.v
+++ b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfrtn cell (
+    sky130_fd_sc_lp__dfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfrtn cell (
+    sky130_fd_sc_lp__dfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.v b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.v
index c867ac9..2b62455 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.v
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfrtp cell (
+    sky130_fd_sc_lp__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfrtp cell (
+    sky130_fd_sc_lp__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.v b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.v
index fb8c73b..1afa23d 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.v
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfrtp cell (
+    sky130_fd_sc_lp__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfrtp cell (
+    sky130_fd_sc_lp__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.v b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.v
index 610e765..94e4376 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.v
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dfrtp cell (
+    sky130_fd_sc_lp__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfrtp cell (
+    sky130_fd_sc_lp__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.v b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.v
index 98292f0..bee7587 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.v
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dfsbp cell (
+    sky130_fd_sc_lp__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfsbp cell (
+    sky130_fd_sc_lp__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.v b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.v
index cce9b9a..2d03010 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.v
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dfsbp cell (
+    sky130_fd_sc_lp__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfsbp cell (
+    sky130_fd_sc_lp__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.v b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.v
index 17790bb..34bba41 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.v
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dfsbp cell (
+    sky130_fd_sc_lp__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfsbp cell (
+    sky130_fd_sc_lp__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.v b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.v
index a4db335..c8dba7f 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.v
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dfstp cell (
+    sky130_fd_sc_lp__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfstp cell (
+    sky130_fd_sc_lp__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.v b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.v
index a05cd66..4cf67b3 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.v
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dfstp cell (
+    sky130_fd_sc_lp__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfstp cell (
+    sky130_fd_sc_lp__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.v b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.v
index b37bbb2..49f7da0 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.v
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dfstp cell (
+    sky130_fd_sc_lp__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfstp cell (
+    sky130_fd_sc_lp__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.v b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.v
index f0184d8..55cf9bd 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.v
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dfstp cell (
+    sky130_fd_sc_lp__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfstp cell (
+    sky130_fd_sc_lp__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.v b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.v
index ad0171a..c0b8452 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.v
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dfxbp cell (
+    sky130_fd_sc_lp__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfxbp cell (
+    sky130_fd_sc_lp__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.v b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.v
index 1a5769c..9d0f4b6 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.v
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dfxbp cell (
+    sky130_fd_sc_lp__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfxbp cell (
+    sky130_fd_sc_lp__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.v b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.v
index e01ac8c..ebd69ab 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.v
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dfxbp cell (
+    sky130_fd_sc_lp__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfxbp cell (
+    sky130_fd_sc_lp__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.v b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.v
index 06df0ed..2d84cd7 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.v
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dfxtp cell (
+    sky130_fd_sc_lp__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfxtp cell (
+    sky130_fd_sc_lp__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.v b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.v
index 139caec..5bf9e28 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.v
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dfxtp cell (
+    sky130_fd_sc_lp__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfxtp cell (
+    sky130_fd_sc_lp__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.v b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.v
index d817455..6de4c32 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.v
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dfxtp cell (
+    sky130_fd_sc_lp__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfxtp cell (
+    sky130_fd_sc_lp__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.v b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.v
index e917205..92ecb84 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.v
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dfxtp cell (
+    sky130_fd_sc_lp__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dfxtp cell (
+    sky130_fd_sc_lp__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/diode/sky130_fd_sc_lp__diode_0.v b/cells/diode/sky130_fd_sc_lp__diode_0.v
index 7f22aac..50bba30 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_0.v
+++ b/cells/diode/sky130_fd_sc_lp__diode_0.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__diode cell (
+    sky130_fd_sc_lp__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__diode cell (
+    sky130_fd_sc_lp__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/diode/sky130_fd_sc_lp__diode_1.v b/cells/diode/sky130_fd_sc_lp__diode_1.v
index 33d73af..c053d08 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_1.v
+++ b/cells/diode/sky130_fd_sc_lp__diode_1.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_lp__diode cell (
+    sky130_fd_sc_lp__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__diode cell (
+    sky130_fd_sc_lp__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.v b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.v
index 2f527a3..0fb5ca3 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.v
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlclkp cell (
+    sky130_fd_sc_lp__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlclkp cell (
+    sky130_fd_sc_lp__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.v b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.v
index a5e60e7..f4903d7 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.v
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlclkp cell (
+    sky130_fd_sc_lp__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlclkp cell (
+    sky130_fd_sc_lp__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.v b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.v
index 776af97..fbf69e8 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.v
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlclkp cell (
+    sky130_fd_sc_lp__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlclkp cell (
+    sky130_fd_sc_lp__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.v b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.v
index 894cfe0..ba9b8cc 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.v
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlclkp cell (
+    sky130_fd_sc_lp__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlclkp cell (
+    sky130_fd_sc_lp__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.v b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.v
index 2e86e33..eff9a89 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.v
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrbn cell (
+    sky130_fd_sc_lp__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrbn cell (
+    sky130_fd_sc_lp__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.v b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.v
index 65c8896..19ca2d2 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.v
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrbn cell (
+    sky130_fd_sc_lp__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrbn cell (
+    sky130_fd_sc_lp__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.v b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.v
index ad7470d..688ee83 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.v
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrbn cell (
+    sky130_fd_sc_lp__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrbn cell (
+    sky130_fd_sc_lp__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.v b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.v
index 200f6a2..77c1cc6 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.v
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrbp cell (
+    sky130_fd_sc_lp__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrbp cell (
+    sky130_fd_sc_lp__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.v b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.v
index 57c400c..9c432af 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.v
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrbp cell (
+    sky130_fd_sc_lp__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrbp cell (
+    sky130_fd_sc_lp__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.v b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.v
index 4dbd38b..c7a5ad8 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.v
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrbp cell (
+    sky130_fd_sc_lp__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrbp cell (
+    sky130_fd_sc_lp__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.v b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.v
index 61f1b99..6de2c95 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.v
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtn cell (
+    sky130_fd_sc_lp__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtn cell (
+    sky130_fd_sc_lp__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.v b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.v
index 14bd73d..6d2142e 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.v
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtn cell (
+    sky130_fd_sc_lp__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtn cell (
+    sky130_fd_sc_lp__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.v b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.v
index a63491a..19f7070 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.v
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtn cell (
+    sky130_fd_sc_lp__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtn cell (
+    sky130_fd_sc_lp__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.v b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.v
index fe5e955..1eb6133 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.v
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtn cell (
+    sky130_fd_sc_lp__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtn cell (
+    sky130_fd_sc_lp__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.v b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.v
index d1a1df1..0855980 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.v
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.v b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.v
index de04d46..0d52b26 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.v
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.v b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.v
index 353a2ae..8c603d6 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.v
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.v b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.v
index 765156d..55e7533 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.v
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.v b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.v
index f5582c0..ba67822 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.v
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlrtp cell (
+    sky130_fd_sc_lp__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.v b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.v
index 428648e..b5aadc5 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.v
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.v
@@ -55,7 +55,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_lp__dlxbn cell (
+    sky130_fd_sc_lp__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxbn cell (
+    sky130_fd_sc_lp__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.v b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.v
index 66b3ed9..97e015c 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.v
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.v
@@ -55,7 +55,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_lp__dlxbn cell (
+    sky130_fd_sc_lp__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxbn cell (
+    sky130_fd_sc_lp__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.v b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.v
index 2d3506e..bab0e4d 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.v
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlxbp cell (
+    sky130_fd_sc_lp__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxbp cell (
+    sky130_fd_sc_lp__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.v b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.v
index 337b80b..9782aa5 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.v
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlxbp cell (
+    sky130_fd_sc_lp__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxbp cell (
+    sky130_fd_sc_lp__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.v b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.v
index 470ad4b..a83b251 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.v
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlxbp cell (
+    sky130_fd_sc_lp__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxbp cell (
+    sky130_fd_sc_lp__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.v b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.v
index a39338d..47d558e 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.v
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_lp__dlxtn cell (
+    sky130_fd_sc_lp__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxtn cell (
+    sky130_fd_sc_lp__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.v b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.v
index e86c6e4..6b9198f 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.v
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_lp__dlxtn cell (
+    sky130_fd_sc_lp__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxtn cell (
+    sky130_fd_sc_lp__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.v b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.v
index 4ea1f51..f7ca151 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.v
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_lp__dlxtn cell (
+    sky130_fd_sc_lp__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxtn cell (
+    sky130_fd_sc_lp__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.v b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.v
index d675fce..6963ea7 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.v
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlxtp cell (
+    sky130_fd_sc_lp__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxtp cell (
+    sky130_fd_sc_lp__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE)
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.v b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.v
index 9dbd38a..960a1c0 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.v
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlxtp cell (
+    sky130_fd_sc_lp__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxtp cell (
+    sky130_fd_sc_lp__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE)
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.v b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.v
index 0e76615..bd6a3ea 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.v
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlxtp cell (
+    sky130_fd_sc_lp__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlxtp cell (
+    sky130_fd_sc_lp__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE)
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.v b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.v
index b56bd3b..abaf2de 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.v
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.v
@@ -54,7 +54,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dlybuf4s15kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s15kapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__dlybuf4s15kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s15kapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.v b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.v
index 1a45369..1c07243 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.v
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.v
@@ -54,7 +54,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dlybuf4s15kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s15kapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__dlybuf4s15kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s15kapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.v b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.v
index 2503ae1..bb22c4c 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.v
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.v
@@ -54,7 +54,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dlybuf4s18kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s18kapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__dlybuf4s18kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s18kapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.v b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.v
index 0cbf86a..74f4a55 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.v
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.v
@@ -54,7 +54,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dlybuf4s18kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s18kapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__dlybuf4s18kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s18kapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.v b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.v
index f9aa959..271d351 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.v
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.v
@@ -54,7 +54,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dlybuf4s25kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s25kapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__dlybuf4s25kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s25kapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.v b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.v
index 6f05693..fbadbf0 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.v
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.v
@@ -54,7 +54,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dlybuf4s25kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s25kapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__dlybuf4s25kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s25kapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.v b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.v
index 2da2fdd..5faba21 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.v
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.v
@@ -54,7 +54,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dlybuf4s50kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s50kapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__dlybuf4s50kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s50kapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.v b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.v
index b5b4c3f..9f49114 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.v
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.v
@@ -54,7 +54,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__dlybuf4s50kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s50kapwr base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__dlybuf4s50kapwr cell (
+    sky130_fd_sc_lp__dlybuf4s50kapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.v b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.v
index 09a6f84..e8a9af3 100644
--- a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.v
+++ b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlygate4s15 cell (
+    sky130_fd_sc_lp__dlygate4s15 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlygate4s15 cell (
+    sky130_fd_sc_lp__dlygate4s15 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.v b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.v
index 353aa7c..4df1d32 100644
--- a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.v
+++ b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlygate4s18 cell (
+    sky130_fd_sc_lp__dlygate4s18 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlygate4s18 cell (
+    sky130_fd_sc_lp__dlygate4s18 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.v b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.v
index 38b707c..47eec5a 100644
--- a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.v
+++ b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlygate4s50 cell (
+    sky130_fd_sc_lp__dlygate4s50 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlygate4s50 cell (
+    sky130_fd_sc_lp__dlygate4s50 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.v b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.v
index 39c4f9d..7f0e0e4 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlymetal6s2s cell (
+    sky130_fd_sc_lp__dlymetal6s2s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlymetal6s2s cell (
+    sky130_fd_sc_lp__dlymetal6s2s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.v b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.v
index 52e6bb2..65174ca 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlymetal6s4s cell (
+    sky130_fd_sc_lp__dlymetal6s4s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlymetal6s4s cell (
+    sky130_fd_sc_lp__dlymetal6s4s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.v b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.v
index 7e222fc..327f8a7 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__dlymetal6s6s cell (
+    sky130_fd_sc_lp__dlymetal6s6s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__dlymetal6s6s cell (
+    sky130_fd_sc_lp__dlymetal6s6s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.v b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.v
index e0269b6..7a14f1c 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.v
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.v b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.v
index 6a0c4af..4f8cb1e 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.v
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.v b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.v
index 4c5d9f4..1af3ff4 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.v
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.v b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.v
index fd5c034..219667d 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.v
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.v b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.v
index 4187e97..d20d35c 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.v
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.v b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.v
index ebff45c..90897d4 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.v
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ebufn cell (
+    sky130_fd_sc_lp__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.v b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.v
index 25b3e74..4e6d32e 100644
--- a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.v
+++ b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__edfxbp cell (
+    sky130_fd_sc_lp__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__edfxbp cell (
+    sky130_fd_sc_lp__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_0.v b/cells/einvn/sky130_fd_sc_lp__einvn_0.v
index 7121360..439976b 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_0.v
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_1.v b/cells/einvn/sky130_fd_sc_lp__einvn_1.v
index 0b3c89e..066bed8 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_1.v
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_2.v b/cells/einvn/sky130_fd_sc_lp__einvn_2.v
index 8da27e7..ae62b7d 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_2.v
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_4.v b/cells/einvn/sky130_fd_sc_lp__einvn_4.v
index 64953a2..598f3a6 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_4.v
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_8.v b/cells/einvn/sky130_fd_sc_lp__einvn_8.v
index ec669b0..5e313ac 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_8.v
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_lp.v b/cells/einvn/sky130_fd_sc_lp__einvn_lp.v
index 9acb365..d1c4f68 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_lp.v
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_m.v b/cells/einvn/sky130_fd_sc_lp__einvn_m.v
index df7c862..6ea6082 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_m.v
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvn cell (
+    sky130_fd_sc_lp__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_0.v b/cells/einvp/sky130_fd_sc_lp__einvp_0.v
index 43c9cac..5f20f07 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_0.v
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_1.v b/cells/einvp/sky130_fd_sc_lp__einvp_1.v
index bf78278..5fde30d 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_1.v
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_2.v b/cells/einvp/sky130_fd_sc_lp__einvp_2.v
index 04e7d78..b220f4e 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_2.v
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_4.v b/cells/einvp/sky130_fd_sc_lp__einvp_4.v
index 20c6227..1a0d4c4 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_4.v
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_8.v b/cells/einvp/sky130_fd_sc_lp__einvp_8.v
index 20c15ca..8d4c8cf 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_8.v
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_lp.v b/cells/einvp/sky130_fd_sc_lp__einvp_lp.v
index dfabb4f..87ada41 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_lp.v
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_m.v b/cells/einvp/sky130_fd_sc_lp__einvp_m.v
index b77f2e0..07e7cf4 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_m.v
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__einvp cell (
+    sky130_fd_sc_lp__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/fa/sky130_fd_sc_lp__fa_0.v b/cells/fa/sky130_fd_sc_lp__fa_0.v
index c1ae7ab..1942cab 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_0.v
+++ b/cells/fa/sky130_fd_sc_lp__fa_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_lp__fa_1.v b/cells/fa/sky130_fd_sc_lp__fa_1.v
index 9754cd2..f2550da 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_1.v
+++ b/cells/fa/sky130_fd_sc_lp__fa_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_lp__fa_2.v b/cells/fa/sky130_fd_sc_lp__fa_2.v
index d2403da..772fa13 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_2.v
+++ b/cells/fa/sky130_fd_sc_lp__fa_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_lp__fa_4.v b/cells/fa/sky130_fd_sc_lp__fa_4.v
index 2542d10..8c7ecdf 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_4.v
+++ b/cells/fa/sky130_fd_sc_lp__fa_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_lp__fa_lp.v b/cells/fa/sky130_fd_sc_lp__fa_lp.v
index b8df773..5eb3b5f 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_lp.v
+++ b/cells/fa/sky130_fd_sc_lp__fa_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_lp__fa_m.v b/cells/fa/sky130_fd_sc_lp__fa_m.v
index e419d9a..1752004 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_m.v
+++ b/cells/fa/sky130_fd_sc_lp__fa_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fa cell (
+    sky130_fd_sc_lp__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_lp__fah_1.v b/cells/fah/sky130_fd_sc_lp__fah_1.v
index 123c59b..0313488 100644
--- a/cells/fah/sky130_fd_sc_lp__fah_1.v
+++ b/cells/fah/sky130_fd_sc_lp__fah_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__fah cell (
+    sky130_fd_sc_lp__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fah cell (
+    sky130_fd_sc_lp__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.v b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.v
index 166165e..0e7156a 100644
--- a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.v
+++ b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__fahcin cell (
+    sky130_fd_sc_lp__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fahcin cell (
+    sky130_fd_sc_lp__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.v b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.v
index 1c60fb1..7465413 100644
--- a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.v
+++ b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.v
@@ -57,7 +57,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_lp__fahcon cell (
+    sky130_fd_sc_lp__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fahcon cell (
+    sky130_fd_sc_lp__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fill/sky130_fd_sc_lp__fill_1.v b/cells/fill/sky130_fd_sc_lp__fill_1.v
index 07cb296..7d13da8 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_1.v
+++ b/cells/fill/sky130_fd_sc_lp__fill_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__fill cell (
+    sky130_fd_sc_lp__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fill cell ();
+    sky130_fd_sc_lp__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_lp__fill_2.v b/cells/fill/sky130_fd_sc_lp__fill_2.v
index 2cfc67e..9739394 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_2.v
+++ b/cells/fill/sky130_fd_sc_lp__fill_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__fill cell (
+    sky130_fd_sc_lp__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fill cell ();
+    sky130_fd_sc_lp__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_lp__fill_4.v b/cells/fill/sky130_fd_sc_lp__fill_4.v
index e95b08e..e79a846 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_4.v
+++ b/cells/fill/sky130_fd_sc_lp__fill_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__fill cell (
+    sky130_fd_sc_lp__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fill cell ();
+    sky130_fd_sc_lp__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_lp__fill_8.v b/cells/fill/sky130_fd_sc_lp__fill_8.v
index 07a62be..3843a86 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_8.v
+++ b/cells/fill/sky130_fd_sc_lp__fill_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_lp__fill cell (
+    sky130_fd_sc_lp__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__fill cell ();
+    sky130_fd_sc_lp__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/ha/sky130_fd_sc_lp__ha_0.v b/cells/ha/sky130_fd_sc_lp__ha_0.v
index ef07fb6..5679e96 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_0.v
+++ b/cells/ha/sky130_fd_sc_lp__ha_0.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_lp__ha_1.v b/cells/ha/sky130_fd_sc_lp__ha_1.v
index b5f0cb7..45dc924 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_1.v
+++ b/cells/ha/sky130_fd_sc_lp__ha_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_lp__ha_2.v b/cells/ha/sky130_fd_sc_lp__ha_2.v
index 7bc1efe..8908b09 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_2.v
+++ b/cells/ha/sky130_fd_sc_lp__ha_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_lp__ha_4.v b/cells/ha/sky130_fd_sc_lp__ha_4.v
index cc08bb3..c0df051 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_4.v
+++ b/cells/ha/sky130_fd_sc_lp__ha_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_lp__ha_lp.v b/cells/ha/sky130_fd_sc_lp__ha_lp.v
index 4fffba9..a1267d2 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_lp.v
+++ b/cells/ha/sky130_fd_sc_lp__ha_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_lp__ha_m.v b/cells/ha/sky130_fd_sc_lp__ha_m.v
index ec3d530..0d6baa3 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_m.v
+++ b/cells/ha/sky130_fd_sc_lp__ha_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__ha cell (
+    sky130_fd_sc_lp__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.v b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.v
index 8fcc882..0e5921e 100644
--- a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.v
+++ b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__inputiso0n cell (
+    sky130_fd_sc_lp__inputiso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inputiso0n cell (
+    sky130_fd_sc_lp__inputiso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.v b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.v
index afc3696..e2e8710 100644
--- a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.v
+++ b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__inputiso0p cell (
+    sky130_fd_sc_lp__inputiso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inputiso0p cell (
+    sky130_fd_sc_lp__inputiso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.v b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.v
index 02f6042..c7bd80e 100644
--- a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.v
+++ b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__inputiso1n cell (
+    sky130_fd_sc_lp__inputiso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inputiso1n cell (
+    sky130_fd_sc_lp__inputiso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.v b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.v
index 60a3c21..0a06bc4 100644
--- a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.v
+++ b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__inputiso1p cell (
+    sky130_fd_sc_lp__inputiso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inputiso1p cell (
+    sky130_fd_sc_lp__inputiso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.v b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.v
index 59a658b..3f8cc67 100644
--- a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.v
+++ b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.v
@@ -53,7 +53,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__inputisolatch cell (
+    sky130_fd_sc_lp__inputisolatch base (
         .Q(Q),
         .D(D),
         .SLEEP_B(SLEEP_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inputisolatch cell (
+    sky130_fd_sc_lp__inputisolatch base (
         .Q(Q),
         .D(D),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/inv/sky130_fd_sc_lp__inv_0.v b/cells/inv/sky130_fd_sc_lp__inv_0.v
index eb994b7..4175f94 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_0.v
+++ b/cells/inv/sky130_fd_sc_lp__inv_0.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_lp__inv_1.v b/cells/inv/sky130_fd_sc_lp__inv_1.v
index 87c1b8e..dc62059 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_1.v
+++ b/cells/inv/sky130_fd_sc_lp__inv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_lp__inv_16.v b/cells/inv/sky130_fd_sc_lp__inv_16.v
index 43d65d1..e59e721 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_16.v
+++ b/cells/inv/sky130_fd_sc_lp__inv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_lp__inv_2.v b/cells/inv/sky130_fd_sc_lp__inv_2.v
index 0cf04d9..6b90c01 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_2.v
+++ b/cells/inv/sky130_fd_sc_lp__inv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_lp__inv_4.v b/cells/inv/sky130_fd_sc_lp__inv_4.v
index 3549c0e..f5c904c 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_4.v
+++ b/cells/inv/sky130_fd_sc_lp__inv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_lp__inv_8.v b/cells/inv/sky130_fd_sc_lp__inv_8.v
index 97992c6..48c7b29 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_8.v
+++ b/cells/inv/sky130_fd_sc_lp__inv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_lp__inv_lp.v b/cells/inv/sky130_fd_sc_lp__inv_lp.v
index f12e52e..c23c99e 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_lp.v
+++ b/cells/inv/sky130_fd_sc_lp__inv_lp.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_lp__inv_m.v b/cells/inv/sky130_fd_sc_lp__inv_m.v
index a628d25..2c7a636 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_m.v
+++ b/cells/inv/sky130_fd_sc_lp__inv_m.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__inv cell (
+    sky130_fd_sc_lp__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.v b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.v
index 70192f5..4c7b18a 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.v
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.v
@@ -53,7 +53,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__invkapwr cell (
+    sky130_fd_sc_lp__invkapwr base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__invkapwr cell (
+    sky130_fd_sc_lp__invkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.v b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.v
index ccc31f7..8d45d76 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.v
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.v
@@ -53,7 +53,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__invkapwr cell (
+    sky130_fd_sc_lp__invkapwr base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__invkapwr cell (
+    sky130_fd_sc_lp__invkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.v b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.v
index a58a16c..9a5e954 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.v
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.v
@@ -53,7 +53,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__invkapwr cell (
+    sky130_fd_sc_lp__invkapwr base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__invkapwr cell (
+    sky130_fd_sc_lp__invkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.v b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.v
index 4802b48..5f55d62 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.v
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.v
@@ -53,7 +53,7 @@
     input  KAPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__invkapwr cell (
+    sky130_fd_sc_lp__invkapwr base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__invkapwr cell (
+    sky130_fd_sc_lp__invkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_0.v b/cells/invlp/sky130_fd_sc_lp__invlp_0.v
index beebe27..726a1ae 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_0.v
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_0.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_1.v b/cells/invlp/sky130_fd_sc_lp__invlp_1.v
index d9b2f4d..f0cfeda 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_1.v
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_2.v b/cells/invlp/sky130_fd_sc_lp__invlp_2.v
index c3296aa..fd47ca2 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_2.v
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_4.v b/cells/invlp/sky130_fd_sc_lp__invlp_4.v
index 80edd30..6bd238d 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_4.v
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_8.v b/cells/invlp/sky130_fd_sc_lp__invlp_8.v
index 3215904..06c133d 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_8.v
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_m.v b/cells/invlp/sky130_fd_sc_lp__invlp_m.v
index 91ab1c5..2d53913 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_m.v
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_m.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__invlp cell (
+    sky130_fd_sc_lp__invlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.v b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.v
index c5af121..72405df 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.v
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.v
@@ -53,7 +53,7 @@
     input  KAGND  ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__iso0n cell (
+    sky130_fd_sc_lp__iso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -95,7 +95,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__iso0n cell (
+    sky130_fd_sc_lp__iso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.v b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.v
index a46ee4b..d01c5b5 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.v
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.v
@@ -53,7 +53,7 @@
     input  KAGND  ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__iso0n cell (
+    sky130_fd_sc_lp__iso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -95,7 +95,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__iso0n cell (
+    sky130_fd_sc_lp__iso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.v b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.v
index c860961..516e375 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.v
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__iso0p cell (
+    sky130_fd_sc_lp__iso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -95,7 +95,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__iso0p cell (
+    sky130_fd_sc_lp__iso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.v b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.v
index fe6e81b..bd53250 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.v
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__iso0p cell (
+    sky130_fd_sc_lp__iso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -95,7 +95,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__iso0p cell (
+    sky130_fd_sc_lp__iso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.v b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.v
index 6bca557..ed9be67 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.v
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.v
@@ -53,7 +53,7 @@
     input  KAGND  ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__iso1n cell (
+    sky130_fd_sc_lp__iso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -95,7 +95,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__iso1n cell (
+    sky130_fd_sc_lp__iso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.v b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.v
index 36832e1..fc83605 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.v
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.v
@@ -53,7 +53,7 @@
     input  KAGND  ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__iso1n cell (
+    sky130_fd_sc_lp__iso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -95,7 +95,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__iso1n cell (
+    sky130_fd_sc_lp__iso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.v b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.v
index 70b1dcb..56430cf 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.v
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__iso1p cell (
+    sky130_fd_sc_lp__iso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -95,7 +95,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__iso1p cell (
+    sky130_fd_sc_lp__iso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.v b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.v
index 6be9d7c..3e171c2 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.v
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__iso1p cell (
+    sky130_fd_sc_lp__iso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -95,7 +95,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__iso1p cell (
+    sky130_fd_sc_lp__iso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.v b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.v
index 016324c..14d3265 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.v
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__isobufsrc cell (
+    sky130_fd_sc_lp__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__isobufsrc cell (
+    sky130_fd_sc_lp__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.v b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.v
index 8d98263..241f457 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.v
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__isobufsrc cell (
+    sky130_fd_sc_lp__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__isobufsrc cell (
+    sky130_fd_sc_lp__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.v b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.v
index 6e0897b..5a68336 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.v
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_lp__isobufsrc cell (
+    sky130_fd_sc_lp__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__isobufsrc cell (
+    sky130_fd_sc_lp__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.v b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.v
index cc99267..76ea68b 100644
--- a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.v
+++ b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__isolatch cell (
+    sky130_fd_sc_lp__isolatch base (
         .Q(Q),
         .D(D),
         .SLEEP_B(SLEEP_B),
@@ -101,7 +101,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_lp__isolatch cell (
+    sky130_fd_sc_lp__isolatch base (
         .Q(Q),
         .D(D),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.v b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.v
index e94d359..b02e5fa 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.v
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.v
@@ -55,7 +55,7 @@
     input  DESTVPB;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__lsbuf cell (
+    sky130_fd_sc_lp__lsbuf base (
         .X(X),
         .A(A),
         .DESTPWR(DESTPWR),
@@ -102,7 +102,7 @@
     supply1 VPB    ;
     supply0 VNB    ;
 
-    sky130_fd_sc_lp__lsbuf cell (
+    sky130_fd_sc_lp__lsbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.v b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.v
index 94b3913..bd9dcda 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.v
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.v
@@ -57,7 +57,7 @@
     input  DESTVPB;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__lsbufiso0p cell (
+    sky130_fd_sc_lp__lsbufiso0p base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -107,7 +107,7 @@
     supply1 VPB    ;
     supply0 VNB    ;
 
-    sky130_fd_sc_lp__lsbufiso0p cell (
+    sky130_fd_sc_lp__lsbufiso0p base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.v b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.v
index 6a96d7a..e0daffa 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.v
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.v
@@ -57,7 +57,7 @@
     input  DESTVPB;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_lp__lsbufiso1p cell (
+    sky130_fd_sc_lp__lsbufiso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -107,7 +107,7 @@
     supply1 VPB    ;
     supply0 VNB    ;
 
-    sky130_fd_sc_lp__lsbufiso1p cell (
+    sky130_fd_sc_lp__lsbufiso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_0.v b/cells/maj3/sky130_fd_sc_lp__maj3_0.v
index 6c742cf..52aa5ca 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_0.v
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_0.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_1.v b/cells/maj3/sky130_fd_sc_lp__maj3_1.v
index 31f2a90..3679b2e 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_1.v
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_2.v b/cells/maj3/sky130_fd_sc_lp__maj3_2.v
index fefcfc5..4c4c9ec 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_2.v
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_4.v b/cells/maj3/sky130_fd_sc_lp__maj3_4.v
index d3241bb..d3e857c 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_4.v
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_lp.v b/cells/maj3/sky130_fd_sc_lp__maj3_lp.v
index 300cdc6..f197476 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_lp.v
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_m.v b/cells/maj3/sky130_fd_sc_lp__maj3_m.v
index 5371a52..d067d43 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_m.v
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__maj3 cell (
+    sky130_fd_sc_lp__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_0.v b/cells/mux2/sky130_fd_sc_lp__mux2_0.v
index dcf44ee..fa0c467 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_0.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_0.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_1.v b/cells/mux2/sky130_fd_sc_lp__mux2_1.v
index 6eebb73..fc5c709 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_1.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_2.v b/cells/mux2/sky130_fd_sc_lp__mux2_2.v
index f52d127..17437bb 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_2.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_4.v b/cells/mux2/sky130_fd_sc_lp__mux2_4.v
index 4684faa..0748ae4 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_4.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_8.v b/cells/mux2/sky130_fd_sc_lp__mux2_8.v
index 005aaac..584cd84 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_8.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_8.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp.v b/cells/mux2/sky130_fd_sc_lp__mux2_lp.v
index d7c2c6a..2b488cc 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.v b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.v
index 76567c7..36caee3 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_m.v b/cells/mux2/sky130_fd_sc_lp__mux2_m.v
index d5df42a..b74fea4 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_m.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2 cell (
+    sky130_fd_sc_lp__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.v b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.v
index c4ffb56..b001fa2 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.v
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.v b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.v
index 4e90586..4625719 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.v
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.v b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.v
index 82c2f41..ff8e3e5 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.v
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.v b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.v
index f006ff4..c53fdc0 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.v
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.v b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.v
index d8d6ffc..fe6dcc5 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.v
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.v b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.v
index 937f07c..dd9043d 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.v
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.v b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.v
index 249dc44..2bbb931 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.v
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux2i cell (
+    sky130_fd_sc_lp__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_0.v b/cells/mux4/sky130_fd_sc_lp__mux4_0.v
index da96df5..77eba5e 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_0.v
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_1.v b/cells/mux4/sky130_fd_sc_lp__mux4_1.v
index 5fcd9f7..4da8d38 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_1.v
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_2.v b/cells/mux4/sky130_fd_sc_lp__mux4_2.v
index 2391ef0..b4eca75 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_2.v
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_4.v b/cells/mux4/sky130_fd_sc_lp__mux4_4.v
index cfaccc2..77ccd27 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_4.v
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_lp.v b/cells/mux4/sky130_fd_sc_lp__mux4_lp.v
index 5c536ad..1abbfbc 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_lp.v
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_m.v b/cells/mux4/sky130_fd_sc_lp__mux4_m.v
index 5e3aed2..3c3963e 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_m.v
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__mux4 cell (
+    sky130_fd_sc_lp__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_0.v b/cells/nand2/sky130_fd_sc_lp__nand2_0.v
index da08874..1d7e0eb 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_0.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_1.v b/cells/nand2/sky130_fd_sc_lp__nand2_1.v
index f5f0ed2..6d587aa 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_1.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_2.v b/cells/nand2/sky130_fd_sc_lp__nand2_2.v
index a19f377..2403ae3 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_2.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_4.v b/cells/nand2/sky130_fd_sc_lp__nand2_4.v
index 1582a34..f212391 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_4.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_8.v b/cells/nand2/sky130_fd_sc_lp__nand2_8.v
index e25bde8..ab72a35 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_8.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp.v b/cells/nand2/sky130_fd_sc_lp__nand2_lp.v
index 5119132..2049528 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.v b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.v
index ec404e4..c0d621f 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_m.v b/cells/nand2/sky130_fd_sc_lp__nand2_m.v
index 1d3ad02..e4df016 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_m.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2 cell (
+    sky130_fd_sc_lp__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.v b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.v
index 2aaa6fb..6960d12 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.v
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.v b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.v
index 2b43c68..6be9aca 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.v
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.v b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.v
index d1928b2..72dba0d 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.v
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.v b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.v
index d2855ae..8576780 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.v
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.v b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.v
index dfa95f1..97b5721 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.v
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand2b cell (
+    sky130_fd_sc_lp__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_0.v b/cells/nand3/sky130_fd_sc_lp__nand3_0.v
index e64edca..c218638 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_0.v
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_0.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_1.v b/cells/nand3/sky130_fd_sc_lp__nand3_1.v
index 802820b..3c5cd69 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_1.v
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_2.v b/cells/nand3/sky130_fd_sc_lp__nand3_2.v
index f2273a0..7637f7e 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_2.v
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_4.v b/cells/nand3/sky130_fd_sc_lp__nand3_4.v
index 03cc9f2..b46639d 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_4.v
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_lp.v b/cells/nand3/sky130_fd_sc_lp__nand3_lp.v
index 854c484..d774632 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_lp.v
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_m.v b/cells/nand3/sky130_fd_sc_lp__nand3_m.v
index 29a80d4..673cfdc 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_m.v
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3 cell (
+    sky130_fd_sc_lp__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.v b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.v
index 7c154fd..b3d9f92 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.v
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.v b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.v
index 132924e..8170ec7 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.v
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.v b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.v
index 4b05e9f..7eee016 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.v
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.v b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.v
index ad5b698..ef5b956 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.v
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.v b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.v
index 5a9ad72..b441f69 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.v
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand3b cell (
+    sky130_fd_sc_lp__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_0.v b/cells/nand4/sky130_fd_sc_lp__nand4_0.v
index 2a20750..3de9e7c 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_0.v
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_1.v b/cells/nand4/sky130_fd_sc_lp__nand4_1.v
index 8c9f64a..cd38c63 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_1.v
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_2.v b/cells/nand4/sky130_fd_sc_lp__nand4_2.v
index 76d7297..cce051c 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_2.v
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_4.v b/cells/nand4/sky130_fd_sc_lp__nand4_4.v
index de9c3b7..bf13265 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_4.v
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_lp.v b/cells/nand4/sky130_fd_sc_lp__nand4_lp.v
index 756981f..6ff3dcb 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_lp.v
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_m.v b/cells/nand4/sky130_fd_sc_lp__nand4_m.v
index 2bc7ffe..d193bc2 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_m.v
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4 cell (
+    sky130_fd_sc_lp__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.v b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.v
index b20a413..3b161be 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.v
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.v b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.v
index 37f8bf2..84f3bad 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.v
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.v b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.v
index 2c88afc..98dc813 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.v
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.v b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.v
index cb097c1..3f02b9e 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.v
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.v b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.v
index f9638ae..04cd2d6 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.v
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4b cell (
+    sky130_fd_sc_lp__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.v b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.v
index 57555fe..dd72adb 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.v
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.v b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.v
index bb0d481..dd64fbb 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.v
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.v b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.v
index db79491..d7e3a7a 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.v
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.v b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.v
index 529c858..22c37f5 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.v
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.v b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.v
index 4968a37..e706bf8 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.v
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nand4bb cell (
+    sky130_fd_sc_lp__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_0.v b/cells/nor2/sky130_fd_sc_lp__nor2_0.v
index 2245938..6a045df 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_0.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_1.v b/cells/nor2/sky130_fd_sc_lp__nor2_1.v
index dd8bc4c..bdcd95a 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_1.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_2.v b/cells/nor2/sky130_fd_sc_lp__nor2_2.v
index 54748c1..4981334 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_2.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_4.v b/cells/nor2/sky130_fd_sc_lp__nor2_4.v
index 69c042f..0d228b3 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_4.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_8.v b/cells/nor2/sky130_fd_sc_lp__nor2_8.v
index e85e7bb..168dfbb 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_8.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp.v b/cells/nor2/sky130_fd_sc_lp__nor2_lp.v
index 32e1113..eaffb03 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.v b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.v
index 4b50fd5..0ddf207 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_m.v b/cells/nor2/sky130_fd_sc_lp__nor2_m.v
index 1d6deb9..6aaefc8 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_m.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2 cell (
+    sky130_fd_sc_lp__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.v b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.v
index 4e5d1f5..38ba18f 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.v
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.v b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.v
index a3020be..4a9be3c 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.v
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.v b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.v
index ec84db0..f61eaa5 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.v
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.v b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.v
index c9ece8a..4ac57fd 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.v
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.v b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.v
index 251eda0..2d08432 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.v
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor2b cell (
+    sky130_fd_sc_lp__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_0.v b/cells/nor3/sky130_fd_sc_lp__nor3_0.v
index dc1aabf..f547d55 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_0.v
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_1.v b/cells/nor3/sky130_fd_sc_lp__nor3_1.v
index e10c6bb..f16dd4e 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_1.v
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_2.v b/cells/nor3/sky130_fd_sc_lp__nor3_2.v
index 24fdcbe..40bad36 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_2.v
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_4.v b/cells/nor3/sky130_fd_sc_lp__nor3_4.v
index 490263c..7e52b12 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_4.v
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_lp.v b/cells/nor3/sky130_fd_sc_lp__nor3_lp.v
index 21b7941..984bcf9 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_lp.v
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_m.v b/cells/nor3/sky130_fd_sc_lp__nor3_m.v
index 7d146d9..0ee5fcc 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_m.v
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3 cell (
+    sky130_fd_sc_lp__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.v b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.v
index 5c7bacc..14e9b4d 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.v
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.v b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.v
index c2f8323..0fcede7 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.v
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.v b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.v
index 1daa6ce..8b96f38 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.v
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.v b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.v
index 8fbde98..7412fb3 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.v
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.v b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.v
index 5d67038..79b1ac5 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.v
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor3b cell (
+    sky130_fd_sc_lp__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_0.v b/cells/nor4/sky130_fd_sc_lp__nor4_0.v
index f48f257..94bb32f 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_0.v
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_1.v b/cells/nor4/sky130_fd_sc_lp__nor4_1.v
index f635ad0..a9e43a4 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_1.v
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_2.v b/cells/nor4/sky130_fd_sc_lp__nor4_2.v
index cf3797a..00cda8c 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_2.v
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_4.v b/cells/nor4/sky130_fd_sc_lp__nor4_4.v
index 9a1e781..03c5643 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_4.v
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_lp.v b/cells/nor4/sky130_fd_sc_lp__nor4_lp.v
index 768a9fd..d8b0d4f 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_lp.v
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_m.v b/cells/nor4/sky130_fd_sc_lp__nor4_m.v
index da6bae1..5686faf 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_m.v
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4 cell (
+    sky130_fd_sc_lp__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.v b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.v
index eaeb619..4f68cd7 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.v
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.v b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.v
index b37894e..a450352 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.v
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.v b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.v
index 8f54514..183376e 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.v
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.v b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.v
index e0831e4..f92f671 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.v
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.v b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.v
index f0a0ee9..054f353 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.v
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4b cell (
+    sky130_fd_sc_lp__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.v b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.v
index 395ba15..24579a8 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.v
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.v b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.v
index d2113fa..e180d15 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.v
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.v b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.v
index 09036bf..98479e2 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.v
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.v b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.v
index 41d4ac1..6549e9d 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.v
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.v b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.v
index 6d6e079..6ecccae 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.v
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__nor4bb cell (
+    sky130_fd_sc_lp__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.v b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.v
index bf624d5..38bd99d 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.v
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.v b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.v
index 7e8a35d..cf83513 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.v
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.v b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.v
index 56b46d4..61bd7e5 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.v
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.v b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.v
index 6d985a9..ca48b52 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.v
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.v b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.v
index 3e1cf4a..854a921 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.v
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.v b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.v
index e5ce971..8e5b5de 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.v
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111a cell (
+    sky130_fd_sc_lp__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.v b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.v
index 9b2e34e..b76ce2c 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.v
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.v b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.v
index 7168b45..27b8f5e 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.v
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.v b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.v
index f9f51e7..8b6ba98 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.v
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.v b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.v
index 16cf608..397321d 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.v
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.v b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.v
index d5a6510..3a7ad0d 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.v
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.v b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.v
index 422ac61..77d48ef 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.v
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2111ai cell (
+    sky130_fd_sc_lp__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_0.v b/cells/o211a/sky130_fd_sc_lp__o211a_0.v
index 4d76c7b..c32c734 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_0.v
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_1.v b/cells/o211a/sky130_fd_sc_lp__o211a_1.v
index 341dfc0..f3f9212 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_1.v
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_2.v b/cells/o211a/sky130_fd_sc_lp__o211a_2.v
index d07f060..11e0ae8 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_2.v
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_4.v b/cells/o211a/sky130_fd_sc_lp__o211a_4.v
index 9cdc484..feb15f0 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_4.v
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_lp.v b/cells/o211a/sky130_fd_sc_lp__o211a_lp.v
index 6281b0e..c4a34b7 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_lp.v
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_m.v b/cells/o211a/sky130_fd_sc_lp__o211a_m.v
index f591c98..51fb436 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_m.v
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211a cell (
+    sky130_fd_sc_lp__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.v b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.v
index e3759da..fe85979 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.v
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.v b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.v
index f1906b8..c1d0060 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.v
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.v b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.v
index 21a77ac..36d7045 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.v
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.v b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.v
index fa737fa..e6e4014 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.v
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.v b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.v
index d18eb02..d9f7540 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.v
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.v b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.v
index bffaa14..b46fd7b 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.v
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o211ai cell (
+    sky130_fd_sc_lp__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_0.v b/cells/o21a/sky130_fd_sc_lp__o21a_0.v
index 99515cf..cfd0467 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_0.v
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_1.v b/cells/o21a/sky130_fd_sc_lp__o21a_1.v
index 023f48b..560cb2e 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_1.v
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_2.v b/cells/o21a/sky130_fd_sc_lp__o21a_2.v
index 82630f2..950ca83 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_2.v
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_4.v b/cells/o21a/sky130_fd_sc_lp__o21a_4.v
index 6d69622..1330d8b 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_4.v
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_lp.v b/cells/o21a/sky130_fd_sc_lp__o21a_lp.v
index 092528b..52bfae1 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_lp.v
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_m.v b/cells/o21a/sky130_fd_sc_lp__o21a_m.v
index 69d3cf8..384113e 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_m.v
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21a cell (
+    sky130_fd_sc_lp__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.v b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.v
index 7c1ec6a..583f78a 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.v
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.v b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.v
index 14a3ea8..6fbdddd 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.v
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.v b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.v
index 316615c..b8443db 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.v
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.v b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.v
index 34b4a32..45c6502 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.v
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.v b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.v
index 1e31543..f4356ec 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.v
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.v b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.v
index 37edb41..dc78039 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.v
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ai cell (
+    sky130_fd_sc_lp__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.v b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.v
index 59abc54..9b279cc 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.v
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.v b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.v
index 980c64d..4c2569c 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.v
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.v b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.v
index 37b6c0d..b7772c5 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.v
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.v b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.v
index ccee32d..ecd5222 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.v
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.v b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.v
index 23c42ee..e66adb5 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.v
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.v b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.v
index 4c983fc..65bcbb5 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.v
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21ba cell (
+    sky130_fd_sc_lp__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.v b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.v
index 4950811..1060d80 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.v
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.v b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.v
index 342b069..5a388e3 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.v
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.v b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.v
index 97f3950..406e8e7 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.v
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.v b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.v
index fa99363..e3ced79 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.v
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.v b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.v
index 218ee65..6279cdc 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.v
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.v b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.v
index 15fc17c..a654116 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.v
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o21bai cell (
+    sky130_fd_sc_lp__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_0.v b/cells/o221a/sky130_fd_sc_lp__o221a_0.v
index 76cbf4a..430510d 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_0.v
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_1.v b/cells/o221a/sky130_fd_sc_lp__o221a_1.v
index 226b5dc..aed07f1 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_1.v
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_2.v b/cells/o221a/sky130_fd_sc_lp__o221a_2.v
index 562cc5a..fdf7219 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_2.v
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_4.v b/cells/o221a/sky130_fd_sc_lp__o221a_4.v
index bd97066..4ddb2da 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_4.v
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_lp.v b/cells/o221a/sky130_fd_sc_lp__o221a_lp.v
index 2c0149e..4801abe 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_lp.v
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_m.v b/cells/o221a/sky130_fd_sc_lp__o221a_m.v
index fe23ef2..ae1545c 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_m.v
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221a cell (
+    sky130_fd_sc_lp__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.v b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.v
index 16ab6fb..6e8e0c1 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.v
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.v b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.v
index 24ad99c..0086292 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.v
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.v b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.v
index b9b319f..d5d53c4 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.v
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.v b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.v
index aa1320c..1556675 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.v
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.v b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.v
index f1e9125..826ddd8 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.v
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.v b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.v
index dc253bc..2258011 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.v
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o221ai cell (
+    sky130_fd_sc_lp__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_0.v b/cells/o22a/sky130_fd_sc_lp__o22a_0.v
index 0bfdbc8..2353711 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_0.v
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_1.v b/cells/o22a/sky130_fd_sc_lp__o22a_1.v
index d7d5845..483a822 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_1.v
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_2.v b/cells/o22a/sky130_fd_sc_lp__o22a_2.v
index f136fc1..d5a93b7 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_2.v
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_4.v b/cells/o22a/sky130_fd_sc_lp__o22a_4.v
index a686762..77d96f0 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_4.v
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_lp.v b/cells/o22a/sky130_fd_sc_lp__o22a_lp.v
index a179cad..6b64e2f 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_lp.v
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_m.v b/cells/o22a/sky130_fd_sc_lp__o22a_m.v
index ed4bdfa..633e5f2 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_m.v
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22a cell (
+    sky130_fd_sc_lp__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.v b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.v
index b770901..96e4ed5 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.v
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.v b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.v
index 710d8d1..a5a9a98 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.v
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.v b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.v
index c6189eb..d7a3d00 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.v
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.v b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.v
index cacd640..54e35c9 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.v
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.v b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.v
index 74d02eb..0914c59 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.v
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.v b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.v
index b944b45..44e3c47 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.v
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o22ai cell (
+    sky130_fd_sc_lp__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.v b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.v
index e23bed5..a4ff227 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.v
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.v b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.v
index b043fd7..42258af 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.v
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.v b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.v
index 37524f4..439b9a7 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.v
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.v b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.v
index 7922b31..08fcde4 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.v
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.v b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.v
index 19b02a7..69076d7 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.v
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.v b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.v
index d57c48b..b847d69 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.v
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2a cell (
+    sky130_fd_sc_lp__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.v b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.v
index d5eccbc..8711afc 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.v
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.v b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.v
index 1fc6ec0..e303c3f 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.v
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.v b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.v
index c1ce738..d8e08c7 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.v
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.v b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.v
index 8047538..f7758f2 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.v
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.v b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.v
index 35fe381..0a9df87 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.v
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.v b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.v
index 55ff2b4..ee7349c 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.v
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o2bb2ai cell (
+    sky130_fd_sc_lp__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_0.v b/cells/o311a/sky130_fd_sc_lp__o311a_0.v
index 44e2db2..d00d8b1 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_0.v
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_1.v b/cells/o311a/sky130_fd_sc_lp__o311a_1.v
index 7de2816..3958464 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_1.v
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_2.v b/cells/o311a/sky130_fd_sc_lp__o311a_2.v
index 810d153..9fc71a5 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_2.v
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_4.v b/cells/o311a/sky130_fd_sc_lp__o311a_4.v
index 59e6063..5e19e0e 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_4.v
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_lp.v b/cells/o311a/sky130_fd_sc_lp__o311a_lp.v
index 371d515..281c826 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_lp.v
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_m.v b/cells/o311a/sky130_fd_sc_lp__o311a_m.v
index 51eee79..bb8cddc 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_m.v
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311a cell (
+    sky130_fd_sc_lp__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.v b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.v
index aadc287..5e97343 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.v
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.v b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.v
index 97d68da..3473a80 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.v
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.v b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.v
index 10e2ef5..c81bc79 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.v
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.v b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.v
index 96bd023..d70a650 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.v
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.v b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.v
index 6a25af4..2f1d22c 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.v
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.v b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.v
index 663a23a..eb58ade 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.v
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o311ai cell (
+    sky130_fd_sc_lp__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_0.v b/cells/o31a/sky130_fd_sc_lp__o31a_0.v
index 62b6fb5..aee1b0d 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_0.v
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_1.v b/cells/o31a/sky130_fd_sc_lp__o31a_1.v
index 9aa418c..4195cab 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_1.v
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_2.v b/cells/o31a/sky130_fd_sc_lp__o31a_2.v
index 67357e7..f515b5c 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_2.v
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_4.v b/cells/o31a/sky130_fd_sc_lp__o31a_4.v
index 496f778..ae9c686 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_4.v
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_lp.v b/cells/o31a/sky130_fd_sc_lp__o31a_lp.v
index 1ef5efb..9d7cb29 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_lp.v
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_m.v b/cells/o31a/sky130_fd_sc_lp__o31a_m.v
index 1475afb..d2dd8fd 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_m.v
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31a cell (
+    sky130_fd_sc_lp__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.v b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.v
index 2f36bfa..7e94ba0 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.v
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.v b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.v
index 2eaf031..f8095c4 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.v
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.v b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.v
index abeb0ad..433ac1d 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.v
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.v b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.v
index 4b95abc..72263bf 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.v
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.v b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.v
index 826a92b..b8553b9 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.v
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.v b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.v
index d8415d0..5a50d40 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.v
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o31ai cell (
+    sky130_fd_sc_lp__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_0.v b/cells/o32a/sky130_fd_sc_lp__o32a_0.v
index d6904e3..cc090c4 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_0.v
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_1.v b/cells/o32a/sky130_fd_sc_lp__o32a_1.v
index 98d6ae2..3262537 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_1.v
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_2.v b/cells/o32a/sky130_fd_sc_lp__o32a_2.v
index 35a6b2f..20d04d7 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_2.v
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_4.v b/cells/o32a/sky130_fd_sc_lp__o32a_4.v
index bf457bc..574a9aa 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_4.v
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_lp.v b/cells/o32a/sky130_fd_sc_lp__o32a_lp.v
index cd27f82..ae0e740 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_lp.v
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_m.v b/cells/o32a/sky130_fd_sc_lp__o32a_m.v
index 8d9b9fd..b2f4603 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_m.v
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32a cell (
+    sky130_fd_sc_lp__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.v b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.v
index 97b8fd9..69e2215 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.v
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.v b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.v
index 557daf8..938ef0e 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.v
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.v b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.v
index 344626f..25c91f0 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.v
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.v b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.v
index e9ff31b..0de85d2 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.v
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.v b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.v
index 0adc868..deb745a 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.v
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.v b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.v
index be095f2..60de9ec 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.v
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o32ai cell (
+    sky130_fd_sc_lp__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_0.v b/cells/o41a/sky130_fd_sc_lp__o41a_0.v
index 0415cf3..0556d25 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_0.v
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_1.v b/cells/o41a/sky130_fd_sc_lp__o41a_1.v
index d917b0f..6541612 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_1.v
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_2.v b/cells/o41a/sky130_fd_sc_lp__o41a_2.v
index 3b4f1e3..4508c75 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_2.v
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_4.v b/cells/o41a/sky130_fd_sc_lp__o41a_4.v
index f6046e3..02bf656 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_4.v
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_lp.v b/cells/o41a/sky130_fd_sc_lp__o41a_lp.v
index 39a8e56..f0d69b2 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_lp.v
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_m.v b/cells/o41a/sky130_fd_sc_lp__o41a_m.v
index f50e39c..b1b2695 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_m.v
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41a cell (
+    sky130_fd_sc_lp__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.v b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.v
index 47e1ea9..132855c 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.v
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.v b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.v
index a64d9cc..3ac42da 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.v
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.v b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.v
index 5d29f7e..681319b 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.v
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.v b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.v
index 99ab536..0c2ab29 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.v
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.v b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.v
index 0d5818d..4f4c8a4 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.v
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.v b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.v
index 4e84fe0..b7852c1 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.v
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__o41ai cell (
+    sky130_fd_sc_lp__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/or2/sky130_fd_sc_lp__or2_0.v b/cells/or2/sky130_fd_sc_lp__or2_0.v
index 3f275eb..e1d5379 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_0.v
+++ b/cells/or2/sky130_fd_sc_lp__or2_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_lp__or2_1.v b/cells/or2/sky130_fd_sc_lp__or2_1.v
index 0b2df66..d52e5db 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_1.v
+++ b/cells/or2/sky130_fd_sc_lp__or2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_lp__or2_2.v b/cells/or2/sky130_fd_sc_lp__or2_2.v
index f545b9c..eaaa8d9 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_2.v
+++ b/cells/or2/sky130_fd_sc_lp__or2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_lp__or2_4.v b/cells/or2/sky130_fd_sc_lp__or2_4.v
index 6d2a366..23a3686 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_4.v
+++ b/cells/or2/sky130_fd_sc_lp__or2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp.v b/cells/or2/sky130_fd_sc_lp__or2_lp.v
index b881e45..275afad 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp.v
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp2.v b/cells/or2/sky130_fd_sc_lp__or2_lp2.v
index 2da0987..b06dee0 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp2.v
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_lp__or2_m.v b/cells/or2/sky130_fd_sc_lp__or2_m.v
index c3b5e8f..848e7f0 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_m.v
+++ b/cells/or2/sky130_fd_sc_lp__or2_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2 cell (
+    sky130_fd_sc_lp__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_1.v b/cells/or2b/sky130_fd_sc_lp__or2b_1.v
index e0e66cd..6402322 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_1.v
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_2.v b/cells/or2b/sky130_fd_sc_lp__or2b_2.v
index 0c488ce..844a90c 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_2.v
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_4.v b/cells/or2b/sky130_fd_sc_lp__or2b_4.v
index bf1be2c..d5b9641 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_4.v
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_lp.v b/cells/or2b/sky130_fd_sc_lp__or2b_lp.v
index f5c4eb2..b50a201 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_lp.v
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_lp.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_m.v b/cells/or2b/sky130_fd_sc_lp__or2b_m.v
index 5dca81a..1bcdc14 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_m.v
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_m.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or2b cell (
+    sky130_fd_sc_lp__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or3/sky130_fd_sc_lp__or3_0.v b/cells/or3/sky130_fd_sc_lp__or3_0.v
index 3e065c2..31276f5 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_0.v
+++ b/cells/or3/sky130_fd_sc_lp__or3_0.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_lp__or3_1.v b/cells/or3/sky130_fd_sc_lp__or3_1.v
index 7ac392e..5b07fae 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_1.v
+++ b/cells/or3/sky130_fd_sc_lp__or3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_lp__or3_2.v b/cells/or3/sky130_fd_sc_lp__or3_2.v
index c8bb00b..86711e5 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_2.v
+++ b/cells/or3/sky130_fd_sc_lp__or3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_lp__or3_4.v b/cells/or3/sky130_fd_sc_lp__or3_4.v
index 02bccaa..e15498f 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_4.v
+++ b/cells/or3/sky130_fd_sc_lp__or3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_lp__or3_lp.v b/cells/or3/sky130_fd_sc_lp__or3_lp.v
index cb04459..004df48 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_lp.v
+++ b/cells/or3/sky130_fd_sc_lp__or3_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_lp__or3_m.v b/cells/or3/sky130_fd_sc_lp__or3_m.v
index 86b5abd..3848bc3 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_m.v
+++ b/cells/or3/sky130_fd_sc_lp__or3_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3 cell (
+    sky130_fd_sc_lp__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_1.v b/cells/or3b/sky130_fd_sc_lp__or3b_1.v
index 98996c3..6e9cc7e 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_1.v
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_2.v b/cells/or3b/sky130_fd_sc_lp__or3b_2.v
index bddaa30..eb8f73b 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_2.v
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_4.v b/cells/or3b/sky130_fd_sc_lp__or3b_4.v
index 738fff8..fece61f 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_4.v
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_lp.v b/cells/or3b/sky130_fd_sc_lp__or3b_lp.v
index 3e82ce6..e0fbe60 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_lp.v
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_lp.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_m.v b/cells/or3b/sky130_fd_sc_lp__or3b_m.v
index a8fbd6a..0c285fa 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_m.v
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_m.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or3b cell (
+    sky130_fd_sc_lp__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_lp__or4_0.v b/cells/or4/sky130_fd_sc_lp__or4_0.v
index 53c3e98..3e20c73 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_0.v
+++ b/cells/or4/sky130_fd_sc_lp__or4_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or4 cell (
+    sky130_fd_sc_lp__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or4 cell (
+    sky130_fd_sc_lp__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_lp__or4_1.v b/cells/or4/sky130_fd_sc_lp__or4_1.v
index 48ceeec..12d4313 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_1.v
+++ b/cells/or4/sky130_fd_sc_lp__or4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or4 cell (
+    sky130_fd_sc_lp__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or4 cell (
+    sky130_fd_sc_lp__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_lp__or4_2.v b/cells/or4/sky130_fd_sc_lp__or4_2.v
index c17e588..b2cad6b 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_2.v
+++ b/cells/or4/sky130_fd_sc_lp__or4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_lp__or4 cell (
+    sky130_fd_sc_lp__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_lp__or4 cell (
+    sky130_fd_sc_lp__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/c