diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_1.v b/cells/a2111o/sky130_fd_sc_hs__a2111o_1.v
index c3aa8d7..a694793 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_1.v
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_1.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2111o cell (
+    sky130_fd_sc_hs__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2111o cell (
+    sky130_fd_sc_hs__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_2.v b/cells/a2111o/sky130_fd_sc_hs__a2111o_2.v
index a475bf4..4bbfe04 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_2.v
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_2.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2111o cell (
+    sky130_fd_sc_hs__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2111o cell (
+    sky130_fd_sc_hs__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_4.v b/cells/a2111o/sky130_fd_sc_hs__a2111o_4.v
index cdbc15f..d07f361 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_4.v
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_4.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2111o cell (
+    sky130_fd_sc_hs__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2111o cell (
+    sky130_fd_sc_hs__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.v b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.v
index 7cc17cf..71239fb 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.v
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2111oi cell (
+    sky130_fd_sc_hs__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2111oi cell (
+    sky130_fd_sc_hs__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.v b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.v
index 09e9ded..5bb6d36 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.v
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2111oi cell (
+    sky130_fd_sc_hs__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2111oi cell (
+    sky130_fd_sc_hs__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.v b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.v
index d203233..0c75a74 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.v
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2111oi cell (
+    sky130_fd_sc_hs__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2111oi cell (
+    sky130_fd_sc_hs__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_1.v b/cells/a211o/sky130_fd_sc_hs__a211o_1.v
index bd72785..d1faa78 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_1.v
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_1.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a211o cell (
+    sky130_fd_sc_hs__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a211o cell (
+    sky130_fd_sc_hs__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_2.v b/cells/a211o/sky130_fd_sc_hs__a211o_2.v
index 0b42f89..cf4d68f 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_2.v
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_2.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a211o cell (
+    sky130_fd_sc_hs__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a211o cell (
+    sky130_fd_sc_hs__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_4.v b/cells/a211o/sky130_fd_sc_hs__a211o_4.v
index c639e16..40a0949 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_4.v
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_4.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a211o cell (
+    sky130_fd_sc_hs__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a211o cell (
+    sky130_fd_sc_hs__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_1.v b/cells/a211oi/sky130_fd_sc_hs__a211oi_1.v
index 9da3010..174c761 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_1.v
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_1.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a211oi cell (
+    sky130_fd_sc_hs__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a211oi cell (
+    sky130_fd_sc_hs__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_2.v b/cells/a211oi/sky130_fd_sc_hs__a211oi_2.v
index 2bfceaf..5908f91 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_2.v
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_2.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a211oi cell (
+    sky130_fd_sc_hs__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a211oi cell (
+    sky130_fd_sc_hs__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_4.v b/cells/a211oi/sky130_fd_sc_hs__a211oi_4.v
index 9963f5e..6823a67 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_4.v
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_4.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a211oi cell (
+    sky130_fd_sc_hs__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a211oi cell (
+    sky130_fd_sc_hs__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_1.v b/cells/a21bo/sky130_fd_sc_hs__a21bo_1.v
index ab3bdf7..a1082ff 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_1.v
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_1.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21bo cell (
+    sky130_fd_sc_hs__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21bo cell (
+    sky130_fd_sc_hs__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_2.v b/cells/a21bo/sky130_fd_sc_hs__a21bo_2.v
index dcdc9a8..dbae316 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_2.v
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_2.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21bo cell (
+    sky130_fd_sc_hs__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21bo cell (
+    sky130_fd_sc_hs__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_4.v b/cells/a21bo/sky130_fd_sc_hs__a21bo_4.v
index 9d19b8f..6c3cc34 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_4.v
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_4.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21bo cell (
+    sky130_fd_sc_hs__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21bo cell (
+    sky130_fd_sc_hs__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_1.v b/cells/a21boi/sky130_fd_sc_hs__a21boi_1.v
index a2c9c9e..1b5740c 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_1.v
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_1.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21boi cell (
+    sky130_fd_sc_hs__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21boi cell (
+    sky130_fd_sc_hs__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_2.v b/cells/a21boi/sky130_fd_sc_hs__a21boi_2.v
index 935760b..f5bb6ac 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_2.v
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_2.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21boi cell (
+    sky130_fd_sc_hs__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21boi cell (
+    sky130_fd_sc_hs__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_4.v b/cells/a21boi/sky130_fd_sc_hs__a21boi_4.v
index f6955b1..142bb41 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_4.v
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_4.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21boi cell (
+    sky130_fd_sc_hs__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21boi cell (
+    sky130_fd_sc_hs__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_1.v b/cells/a21o/sky130_fd_sc_hs__a21o_1.v
index dbc6502..9e8cd5a 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_1.v
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_1.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21o cell (
+    sky130_fd_sc_hs__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21o cell (
+    sky130_fd_sc_hs__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_2.v b/cells/a21o/sky130_fd_sc_hs__a21o_2.v
index 91da68e..bdb0c58 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_2.v
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_2.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21o cell (
+    sky130_fd_sc_hs__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21o cell (
+    sky130_fd_sc_hs__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_4.v b/cells/a21o/sky130_fd_sc_hs__a21o_4.v
index f93e86d..5856a55 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_4.v
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_4.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21o cell (
+    sky130_fd_sc_hs__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21o cell (
+    sky130_fd_sc_hs__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_1.v b/cells/a21oi/sky130_fd_sc_hs__a21oi_1.v
index 824fde7..58e9a36 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_1.v
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_1.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21oi cell (
+    sky130_fd_sc_hs__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21oi cell (
+    sky130_fd_sc_hs__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_2.v b/cells/a21oi/sky130_fd_sc_hs__a21oi_2.v
index c3e26fe..925bf97 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_2.v
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_2.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21oi cell (
+    sky130_fd_sc_hs__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21oi cell (
+    sky130_fd_sc_hs__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_4.v b/cells/a21oi/sky130_fd_sc_hs__a21oi_4.v
index 727a06c..a59c4e7 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_4.v
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_4.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a21oi cell (
+    sky130_fd_sc_hs__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a21oi cell (
+    sky130_fd_sc_hs__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_1.v b/cells/a221o/sky130_fd_sc_hs__a221o_1.v
index d050cfd..57b952d 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_1.v
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_1.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a221o cell (
+    sky130_fd_sc_hs__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a221o cell (
+    sky130_fd_sc_hs__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_2.v b/cells/a221o/sky130_fd_sc_hs__a221o_2.v
index ec2a05b..4393ba5 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_2.v
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_2.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a221o cell (
+    sky130_fd_sc_hs__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a221o cell (
+    sky130_fd_sc_hs__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_4.v b/cells/a221o/sky130_fd_sc_hs__a221o_4.v
index 2054f7a..68036d4 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_4.v
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_4.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a221o cell (
+    sky130_fd_sc_hs__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a221o cell (
+    sky130_fd_sc_hs__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_1.v b/cells/a221oi/sky130_fd_sc_hs__a221oi_1.v
index fa3f352..62ecf25 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_1.v
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_1.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a221oi cell (
+    sky130_fd_sc_hs__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a221oi cell (
+    sky130_fd_sc_hs__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_2.v b/cells/a221oi/sky130_fd_sc_hs__a221oi_2.v
index ec22c0f..48ae8cd 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_2.v
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_2.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a221oi cell (
+    sky130_fd_sc_hs__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a221oi cell (
+    sky130_fd_sc_hs__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_4.v b/cells/a221oi/sky130_fd_sc_hs__a221oi_4.v
index 1ca7b33..bfdc17b 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_4.v
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_4.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a221oi cell (
+    sky130_fd_sc_hs__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a221oi cell (
+    sky130_fd_sc_hs__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o_1.v b/cells/a222o/sky130_fd_sc_hs__a222o_1.v
index a91e7b1..31d6c90 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o_1.v
+++ b/cells/a222o/sky130_fd_sc_hs__a222o_1.v
@@ -59,7 +59,7 @@
     input  C2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a222o cell (
+    sky130_fd_sc_hs__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -105,7 +105,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a222o cell (
+    sky130_fd_sc_hs__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o_2.v b/cells/a222o/sky130_fd_sc_hs__a222o_2.v
index fcfdbb1..e7da71a 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o_2.v
+++ b/cells/a222o/sky130_fd_sc_hs__a222o_2.v
@@ -59,7 +59,7 @@
     input  C2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a222o cell (
+    sky130_fd_sc_hs__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -105,7 +105,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a222o cell (
+    sky130_fd_sc_hs__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi_1.v b/cells/a222oi/sky130_fd_sc_hs__a222oi_1.v
index 8098823..73354b3 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi_1.v
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi_1.v
@@ -59,7 +59,7 @@
     input  C2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a222oi cell (
+    sky130_fd_sc_hs__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -105,7 +105,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a222oi cell (
+    sky130_fd_sc_hs__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi_2.v b/cells/a222oi/sky130_fd_sc_hs__a222oi_2.v
index a6527ab..278757b 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi_2.v
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi_2.v
@@ -59,7 +59,7 @@
     input  C2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a222oi cell (
+    sky130_fd_sc_hs__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -105,7 +105,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a222oi cell (
+    sky130_fd_sc_hs__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_1.v b/cells/a22o/sky130_fd_sc_hs__a22o_1.v
index e3c4cc6..67ed431 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_1.v
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_1.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a22o cell (
+    sky130_fd_sc_hs__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a22o cell (
+    sky130_fd_sc_hs__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_2.v b/cells/a22o/sky130_fd_sc_hs__a22o_2.v
index f96780f..dffc316 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_2.v
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_2.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a22o cell (
+    sky130_fd_sc_hs__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a22o cell (
+    sky130_fd_sc_hs__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_4.v b/cells/a22o/sky130_fd_sc_hs__a22o_4.v
index aa48e4d..4d7865c 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_4.v
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_4.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a22o cell (
+    sky130_fd_sc_hs__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a22o cell (
+    sky130_fd_sc_hs__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_1.v b/cells/a22oi/sky130_fd_sc_hs__a22oi_1.v
index c26ae83..0004d25 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_1.v
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_1.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a22oi cell (
+    sky130_fd_sc_hs__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a22oi cell (
+    sky130_fd_sc_hs__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_2.v b/cells/a22oi/sky130_fd_sc_hs__a22oi_2.v
index c47117b..da280e7 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_2.v
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_2.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a22oi cell (
+    sky130_fd_sc_hs__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a22oi cell (
+    sky130_fd_sc_hs__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_4.v b/cells/a22oi/sky130_fd_sc_hs__a22oi_4.v
index abb061e..2908bfb 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_4.v
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_4.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a22oi cell (
+    sky130_fd_sc_hs__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a22oi cell (
+    sky130_fd_sc_hs__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.v b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.v
index 9ba6854..1cabc9e 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.v
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.v
@@ -56,7 +56,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2bb2o cell (
+    sky130_fd_sc_hs__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -96,7 +96,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2bb2o cell (
+    sky130_fd_sc_hs__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.v b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.v
index 5ca2ed6..3f32691 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.v
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.v
@@ -56,7 +56,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2bb2o cell (
+    sky130_fd_sc_hs__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -96,7 +96,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2bb2o cell (
+    sky130_fd_sc_hs__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.v b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.v
index 8fcb4f5..d3c0354 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.v
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.v
@@ -56,7 +56,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2bb2o cell (
+    sky130_fd_sc_hs__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -96,7 +96,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2bb2o cell (
+    sky130_fd_sc_hs__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.v b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.v
index 9194537..61fc8f4 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.v
@@ -56,7 +56,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2bb2oi cell (
+    sky130_fd_sc_hs__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -96,7 +96,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2bb2oi cell (
+    sky130_fd_sc_hs__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.v b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.v
index f2bc459..704b89b 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.v
@@ -56,7 +56,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2bb2oi cell (
+    sky130_fd_sc_hs__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -96,7 +96,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2bb2oi cell (
+    sky130_fd_sc_hs__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.v b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.v
index c5410cb..23686fc 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.v
@@ -56,7 +56,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a2bb2oi cell (
+    sky130_fd_sc_hs__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -96,7 +96,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a2bb2oi cell (
+    sky130_fd_sc_hs__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_1.v b/cells/a311o/sky130_fd_sc_hs__a311o_1.v
index dcabc90..88bcfaf 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_1.v
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_1.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a311o cell (
+    sky130_fd_sc_hs__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a311o cell (
+    sky130_fd_sc_hs__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_2.v b/cells/a311o/sky130_fd_sc_hs__a311o_2.v
index c5abc85..19fb6e9 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_2.v
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_2.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a311o cell (
+    sky130_fd_sc_hs__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a311o cell (
+    sky130_fd_sc_hs__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_4.v b/cells/a311o/sky130_fd_sc_hs__a311o_4.v
index 9336a2c..02b906d 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_4.v
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_4.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a311o cell (
+    sky130_fd_sc_hs__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a311o cell (
+    sky130_fd_sc_hs__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_1.v b/cells/a311oi/sky130_fd_sc_hs__a311oi_1.v
index 0566378..5510362 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_1.v
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_1.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a311oi cell (
+    sky130_fd_sc_hs__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a311oi cell (
+    sky130_fd_sc_hs__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_2.v b/cells/a311oi/sky130_fd_sc_hs__a311oi_2.v
index c151b63..668a5b2 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_2.v
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_2.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a311oi cell (
+    sky130_fd_sc_hs__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a311oi cell (
+    sky130_fd_sc_hs__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_4.v b/cells/a311oi/sky130_fd_sc_hs__a311oi_4.v
index 9e2c71d..bc878aa 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_4.v
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_4.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a311oi cell (
+    sky130_fd_sc_hs__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a311oi cell (
+    sky130_fd_sc_hs__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_1.v b/cells/a31o/sky130_fd_sc_hs__a31o_1.v
index 2329f26..7d25056 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_1.v
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_1.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a31o cell (
+    sky130_fd_sc_hs__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a31o cell (
+    sky130_fd_sc_hs__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_2.v b/cells/a31o/sky130_fd_sc_hs__a31o_2.v
index 8e0e37b..78b1ea1 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_2.v
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_2.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a31o cell (
+    sky130_fd_sc_hs__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a31o cell (
+    sky130_fd_sc_hs__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_4.v b/cells/a31o/sky130_fd_sc_hs__a31o_4.v
index 6b1a5b4..3be567a 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_4.v
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_4.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a31o cell (
+    sky130_fd_sc_hs__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a31o cell (
+    sky130_fd_sc_hs__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_1.v b/cells/a31oi/sky130_fd_sc_hs__a31oi_1.v
index bdd4f5b..4d0a561 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_1.v
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_1.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a31oi cell (
+    sky130_fd_sc_hs__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a31oi cell (
+    sky130_fd_sc_hs__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_2.v b/cells/a31oi/sky130_fd_sc_hs__a31oi_2.v
index 971381f..80750a4 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_2.v
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_2.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a31oi cell (
+    sky130_fd_sc_hs__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a31oi cell (
+    sky130_fd_sc_hs__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_4.v b/cells/a31oi/sky130_fd_sc_hs__a31oi_4.v
index e184e91..3d11c0b 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_4.v
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_4.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a31oi cell (
+    sky130_fd_sc_hs__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a31oi cell (
+    sky130_fd_sc_hs__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_1.v b/cells/a32o/sky130_fd_sc_hs__a32o_1.v
index edc430b..1da3970 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_1.v
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_1.v
@@ -58,7 +58,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a32o cell (
+    sky130_fd_sc_hs__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -101,7 +101,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a32o cell (
+    sky130_fd_sc_hs__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_2.v b/cells/a32o/sky130_fd_sc_hs__a32o_2.v
index d0247d2..9242669 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_2.v
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_2.v
@@ -58,7 +58,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a32o cell (
+    sky130_fd_sc_hs__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -101,7 +101,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a32o cell (
+    sky130_fd_sc_hs__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_4.v b/cells/a32o/sky130_fd_sc_hs__a32o_4.v
index 81b0a61..69d8d82 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_4.v
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_4.v
@@ -58,7 +58,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a32o cell (
+    sky130_fd_sc_hs__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -101,7 +101,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a32o cell (
+    sky130_fd_sc_hs__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_1.v b/cells/a32oi/sky130_fd_sc_hs__a32oi_1.v
index 48ae75a..deca76a 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_1.v
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_1.v
@@ -58,7 +58,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a32oi cell (
+    sky130_fd_sc_hs__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -101,7 +101,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a32oi cell (
+    sky130_fd_sc_hs__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_2.v b/cells/a32oi/sky130_fd_sc_hs__a32oi_2.v
index eed5c4b..ba94218 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_2.v
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_2.v
@@ -58,7 +58,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a32oi cell (
+    sky130_fd_sc_hs__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -101,7 +101,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a32oi cell (
+    sky130_fd_sc_hs__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_4.v b/cells/a32oi/sky130_fd_sc_hs__a32oi_4.v
index 8dadca7..3577f6c 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_4.v
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_4.v
@@ -58,7 +58,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a32oi cell (
+    sky130_fd_sc_hs__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -101,7 +101,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a32oi cell (
+    sky130_fd_sc_hs__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_1.v b/cells/a41o/sky130_fd_sc_hs__a41o_1.v
index 218d85b..c2db040 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_1.v
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_1.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a41o cell (
+    sky130_fd_sc_hs__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a41o cell (
+    sky130_fd_sc_hs__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_2.v b/cells/a41o/sky130_fd_sc_hs__a41o_2.v
index 62ac36c..5c7db69 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_2.v
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_2.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a41o cell (
+    sky130_fd_sc_hs__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a41o cell (
+    sky130_fd_sc_hs__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_4.v b/cells/a41o/sky130_fd_sc_hs__a41o_4.v
index 0472d8e..77e682d 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_4.v
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_4.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a41o cell (
+    sky130_fd_sc_hs__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a41o cell (
+    sky130_fd_sc_hs__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_1.v b/cells/a41oi/sky130_fd_sc_hs__a41oi_1.v
index 3484338..c4df54e 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_1.v
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_1.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a41oi cell (
+    sky130_fd_sc_hs__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a41oi cell (
+    sky130_fd_sc_hs__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_2.v b/cells/a41oi/sky130_fd_sc_hs__a41oi_2.v
index 57e455f..7ad375b 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_2.v
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_2.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a41oi cell (
+    sky130_fd_sc_hs__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a41oi cell (
+    sky130_fd_sc_hs__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_4.v b/cells/a41oi/sky130_fd_sc_hs__a41oi_4.v
index 16189b5..5b32df2 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_4.v
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_4.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__a41oi cell (
+    sky130_fd_sc_hs__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__a41oi cell (
+    sky130_fd_sc_hs__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/and2/sky130_fd_sc_hs__and2_1.v b/cells/and2/sky130_fd_sc_hs__and2_1.v
index 4439bb9..a657813 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_1.v
+++ b/cells/and2/sky130_fd_sc_hs__and2_1.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and2 cell (
+    sky130_fd_sc_hs__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and2 cell (
+    sky130_fd_sc_hs__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hs__and2_2.v b/cells/and2/sky130_fd_sc_hs__and2_2.v
index 6d8719b..36d0188 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_2.v
+++ b/cells/and2/sky130_fd_sc_hs__and2_2.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and2 cell (
+    sky130_fd_sc_hs__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and2 cell (
+    sky130_fd_sc_hs__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hs__and2_4.v b/cells/and2/sky130_fd_sc_hs__and2_4.v
index 85ad3e3..00bc67a 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_4.v
+++ b/cells/and2/sky130_fd_sc_hs__and2_4.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and2 cell (
+    sky130_fd_sc_hs__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and2 cell (
+    sky130_fd_sc_hs__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_1.v b/cells/and2b/sky130_fd_sc_hs__and2b_1.v
index 15b4c18..829b754 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_1.v
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_1.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and2b cell (
+    sky130_fd_sc_hs__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and2b cell (
+    sky130_fd_sc_hs__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_2.v b/cells/and2b/sky130_fd_sc_hs__and2b_2.v
index 677b5e7..cf375af 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_2.v
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_2.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and2b cell (
+    sky130_fd_sc_hs__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and2b cell (
+    sky130_fd_sc_hs__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_4.v b/cells/and2b/sky130_fd_sc_hs__and2b_4.v
index dab08f8..ce61dd5 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_4.v
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_4.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and2b cell (
+    sky130_fd_sc_hs__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and2b cell (
+    sky130_fd_sc_hs__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and3/sky130_fd_sc_hs__and3_1.v b/cells/and3/sky130_fd_sc_hs__and3_1.v
index b4bdd76..1bc067a 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_1.v
+++ b/cells/and3/sky130_fd_sc_hs__and3_1.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and3 cell (
+    sky130_fd_sc_hs__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and3 cell (
+    sky130_fd_sc_hs__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_hs__and3_2.v b/cells/and3/sky130_fd_sc_hs__and3_2.v
index cc3234f..c0c1573 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_2.v
+++ b/cells/and3/sky130_fd_sc_hs__and3_2.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and3 cell (
+    sky130_fd_sc_hs__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and3 cell (
+    sky130_fd_sc_hs__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_hs__and3_4.v b/cells/and3/sky130_fd_sc_hs__and3_4.v
index 046aefd..e275239 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_4.v
+++ b/cells/and3/sky130_fd_sc_hs__and3_4.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and3 cell (
+    sky130_fd_sc_hs__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and3 cell (
+    sky130_fd_sc_hs__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_1.v b/cells/and3b/sky130_fd_sc_hs__and3b_1.v
index 0806365..1ab6f2e 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_1.v
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_1.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and3b cell (
+    sky130_fd_sc_hs__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and3b cell (
+    sky130_fd_sc_hs__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_2.v b/cells/and3b/sky130_fd_sc_hs__and3b_2.v
index 2c1c3b8..c321303 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_2.v
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_2.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and3b cell (
+    sky130_fd_sc_hs__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and3b cell (
+    sky130_fd_sc_hs__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_4.v b/cells/and3b/sky130_fd_sc_hs__and3b_4.v
index 37fe955..9f84013 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_4.v
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_4.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and3b cell (
+    sky130_fd_sc_hs__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and3b cell (
+    sky130_fd_sc_hs__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hs__and4_1.v b/cells/and4/sky130_fd_sc_hs__and4_1.v
index 5703b1e..91ba17c 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_1.v
+++ b/cells/and4/sky130_fd_sc_hs__and4_1.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4 cell (
+    sky130_fd_sc_hs__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4 cell (
+    sky130_fd_sc_hs__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hs__and4_2.v b/cells/and4/sky130_fd_sc_hs__and4_2.v
index 57f778a..2b20a01 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_2.v
+++ b/cells/and4/sky130_fd_sc_hs__and4_2.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4 cell (
+    sky130_fd_sc_hs__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4 cell (
+    sky130_fd_sc_hs__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hs__and4_4.v b/cells/and4/sky130_fd_sc_hs__and4_4.v
index 89412a5..c445431 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_4.v
+++ b/cells/and4/sky130_fd_sc_hs__and4_4.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4 cell (
+    sky130_fd_sc_hs__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4 cell (
+    sky130_fd_sc_hs__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_1.v b/cells/and4b/sky130_fd_sc_hs__and4b_1.v
index faa4518..23fd086 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_1.v
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_1.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4b cell (
+    sky130_fd_sc_hs__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4b cell (
+    sky130_fd_sc_hs__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_2.v b/cells/and4b/sky130_fd_sc_hs__and4b_2.v
index 107d0b1..8f4effa 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_2.v
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_2.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4b cell (
+    sky130_fd_sc_hs__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4b cell (
+    sky130_fd_sc_hs__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_4.v b/cells/and4b/sky130_fd_sc_hs__and4b_4.v
index e13a253..923d9f6 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_4.v
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_4.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4b cell (
+    sky130_fd_sc_hs__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4b cell (
+    sky130_fd_sc_hs__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_1.v b/cells/and4bb/sky130_fd_sc_hs__and4bb_1.v
index 03c2799..1672753 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_1.v
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_1.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4bb cell (
+    sky130_fd_sc_hs__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4bb cell (
+    sky130_fd_sc_hs__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_2.v b/cells/and4bb/sky130_fd_sc_hs__and4bb_2.v
index 56b87fc..7a90cf1 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_2.v
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_2.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4bb cell (
+    sky130_fd_sc_hs__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4bb cell (
+    sky130_fd_sc_hs__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_4.v b/cells/and4bb/sky130_fd_sc_hs__and4bb_4.v
index 4228018..7aea4de 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_4.v
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_4.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__and4bb cell (
+    sky130_fd_sc_hs__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__and4bb cell (
+    sky130_fd_sc_hs__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/buf/sky130_fd_sc_hs__buf_1.v b/cells/buf/sky130_fd_sc_hs__buf_1.v
index 79a9ee9..43d8385 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_1.v
+++ b/cells/buf/sky130_fd_sc_hs__buf_1.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hs__buf_16.v b/cells/buf/sky130_fd_sc_hs__buf_16.v
index d6f8661..33a1eb7 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_16.v
+++ b/cells/buf/sky130_fd_sc_hs__buf_16.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hs__buf_2.v b/cells/buf/sky130_fd_sc_hs__buf_2.v
index 0912fa8..a420e3f 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_2.v
+++ b/cells/buf/sky130_fd_sc_hs__buf_2.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hs__buf_4.v b/cells/buf/sky130_fd_sc_hs__buf_4.v
index 8d9396a..da874e2 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_4.v
+++ b/cells/buf/sky130_fd_sc_hs__buf_4.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hs__buf_8.v b/cells/buf/sky130_fd_sc_hs__buf_8.v
index 2c08bb5..91ed34a 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_8.v
+++ b/cells/buf/sky130_fd_sc_hs__buf_8.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__buf cell (
+    sky130_fd_sc_hs__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.v b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.v
index b4c9e96..cffa2b9 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.v
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__bufbuf cell (
+    sky130_fd_sc_hs__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__bufbuf cell (
+    sky130_fd_sc_hs__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.v b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.v
index 623bf40..a0f20d3 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.v
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__bufbuf cell (
+    sky130_fd_sc_hs__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__bufbuf cell (
+    sky130_fd_sc_hs__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv_16.v b/cells/bufinv/sky130_fd_sc_hs__bufinv_16.v
index d6c5479..de2dc4f 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv_16.v
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv_16.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__bufinv cell (
+    sky130_fd_sc_hs__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__bufinv cell (
+    sky130_fd_sc_hs__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv_8.v b/cells/bufinv/sky130_fd_sc_hs__bufinv_8.v
index f876347..b69f4f1 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv_8.v
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv_8.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__bufinv cell (
+    sky130_fd_sc_hs__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__bufinv cell (
+    sky130_fd_sc_hs__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.v b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.v
index 7ab96d1..4ed4442 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.v
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.v b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.v
index c859860..e68c9fc 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.v
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.v b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.v
index 35f97f8..e0b878c 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.v
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.v b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.v
index cc17063..d3e5a00 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.v
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.v b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.v
index 8a44888..ef95b4b 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.v
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkbuf cell (
+    sky130_fd_sc_hs__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.v b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.v
index 66b23ea..9b97b20 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.v
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkdlyinv3sd1 cell (
+    sky130_fd_sc_hs__clkdlyinv3sd1 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkdlyinv3sd1 cell (
+    sky130_fd_sc_hs__clkdlyinv3sd1 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.v b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.v
index 5d5a6dc..3b4d9a0 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.v
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkdlyinv3sd2 cell (
+    sky130_fd_sc_hs__clkdlyinv3sd2 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkdlyinv3sd2 cell (
+    sky130_fd_sc_hs__clkdlyinv3sd2 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.v b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.v
index e0c06d6..66057ac 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.v
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkdlyinv3sd3 cell (
+    sky130_fd_sc_hs__clkdlyinv3sd3 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkdlyinv3sd3 cell (
+    sky130_fd_sc_hs__clkdlyinv3sd3 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.v b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.v
index d888135..72058ea 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.v
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkdlyinv5sd1 cell (
+    sky130_fd_sc_hs__clkdlyinv5sd1 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkdlyinv5sd1 cell (
+    sky130_fd_sc_hs__clkdlyinv5sd1 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.v b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.v
index 26d248a..d9404fd 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.v
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkdlyinv5sd2 cell (
+    sky130_fd_sc_hs__clkdlyinv5sd2 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkdlyinv5sd2 cell (
+    sky130_fd_sc_hs__clkdlyinv5sd2 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.v b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.v
index 61b3f7a..9403245 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.v
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkdlyinv5sd3 cell (
+    sky130_fd_sc_hs__clkdlyinv5sd3 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkdlyinv5sd3 cell (
+    sky130_fd_sc_hs__clkdlyinv5sd3 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_1.v b/cells/clkinv/sky130_fd_sc_hs__clkinv_1.v
index e317f87..c1efe22 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_1.v
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_1.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_16.v b/cells/clkinv/sky130_fd_sc_hs__clkinv_16.v
index daab17d..a800979 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_16.v
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_16.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_2.v b/cells/clkinv/sky130_fd_sc_hs__clkinv_2.v
index 3cf1fea..36b2468 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_2.v
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_2.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_4.v b/cells/clkinv/sky130_fd_sc_hs__clkinv_4.v
index b61e16e..bfd3acb 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_4.v
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_4.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_8.v b/cells/clkinv/sky130_fd_sc_hs__clkinv_8.v
index 613f8e2..6bb46cd 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_8.v
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_8.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__clkinv cell (
+    sky130_fd_sc_hs__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/conb/sky130_fd_sc_hs__conb_1.v b/cells/conb/sky130_fd_sc_hs__conb_1.v
index 8610370..68b1ce0 100644
--- a/cells/conb/sky130_fd_sc_hs__conb_1.v
+++ b/cells/conb/sky130_fd_sc_hs__conb_1.v
@@ -47,7 +47,7 @@
     output LO  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__conb cell (
+    sky130_fd_sc_hs__conb base (
         .HI(HI),
         .LO(LO),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__conb cell (
+    sky130_fd_sc_hs__conb base (
         .HI(HI),
         .LO(LO)
     );
diff --git a/cells/decap/sky130_fd_sc_hs__decap_4.v b/cells/decap/sky130_fd_sc_hs__decap_4.v
index 3e7bfc6..f21d6dd 100644
--- a/cells/decap/sky130_fd_sc_hs__decap_4.v
+++ b/cells/decap/sky130_fd_sc_hs__decap_4.v
@@ -43,7 +43,7 @@
 
     input VPWR;
     input VGND;
-    sky130_fd_sc_hs__decap cell (
+    sky130_fd_sc_hs__decap base (
         .VPWR(VPWR),
         .VGND(VGND)
     );
@@ -68,7 +68,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__decap cell ();
+    sky130_fd_sc_hs__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hs__decap_8.v b/cells/decap/sky130_fd_sc_hs__decap_8.v
index 957b238..c2b9a40 100644
--- a/cells/decap/sky130_fd_sc_hs__decap_8.v
+++ b/cells/decap/sky130_fd_sc_hs__decap_8.v
@@ -43,7 +43,7 @@
 
     input VPWR;
     input VGND;
-    sky130_fd_sc_hs__decap cell (
+    sky130_fd_sc_hs__decap base (
         .VPWR(VPWR),
         .VGND(VGND)
     );
@@ -68,7 +68,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__decap cell ();
+    sky130_fd_sc_hs__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.v b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.v
index 85ed637..09dd078 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.v
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.v
@@ -56,7 +56,7 @@
     input  RESET_B;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfbbn cell (
+    sky130_fd_sc_hs__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfbbn cell (
+    sky130_fd_sc_hs__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.v b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.v
index ba70fd6..f8b1a84 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.v
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.v
@@ -56,7 +56,7 @@
     input  RESET_B;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfbbn cell (
+    sky130_fd_sc_hs__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfbbn cell (
+    sky130_fd_sc_hs__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.v b/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.v
index fe9f289..f2537d5 100644
--- a/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.v
+++ b/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.v
@@ -56,7 +56,7 @@
     input  RESET_B;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfbbp cell (
+    sky130_fd_sc_hs__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfbbp cell (
+    sky130_fd_sc_hs__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.v b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.v
index 7147b9c..472a96b 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.v
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.v
@@ -53,7 +53,7 @@
     output Q_N    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfrbp cell (
+    sky130_fd_sc_hs__dfrbp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfrbp cell (
+    sky130_fd_sc_hs__dfrbp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.v b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.v
index 175be38..260941e 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.v
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.v
@@ -53,7 +53,7 @@
     output Q_N    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfrbp cell (
+    sky130_fd_sc_hs__dfrbp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfrbp cell (
+    sky130_fd_sc_hs__dfrbp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.v b/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.v
index 1a75c61..56e3e6d 100644
--- a/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.v
+++ b/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.v
@@ -52,7 +52,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfrtn cell (
+    sky130_fd_sc_hs__dfrtn base (
         .RESET_B(RESET_B),
         .CLK_N(CLK_N),
         .D(D),
@@ -89,7 +89,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfrtn cell (
+    sky130_fd_sc_hs__dfrtn base (
         .RESET_B(RESET_B),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.v b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.v
index f43c169..6856e97 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.v
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.v
@@ -51,7 +51,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfrtp cell (
+    sky130_fd_sc_hs__dfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfrtp cell (
+    sky130_fd_sc_hs__dfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.v b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.v
index 193ee4b..c8c78ac 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.v
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.v
@@ -51,7 +51,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfrtp cell (
+    sky130_fd_sc_hs__dfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfrtp cell (
+    sky130_fd_sc_hs__dfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.v b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.v
index 06b2b11..923a213 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.v
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.v
@@ -51,7 +51,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dfrtp cell (
+    sky130_fd_sc_hs__dfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfrtp cell (
+    sky130_fd_sc_hs__dfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.v b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.v
index 98a0089..d4ee7d7 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.v
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.v
@@ -53,7 +53,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__dfsbp cell (
+    sky130_fd_sc_hs__dfsbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfsbp cell (
+    sky130_fd_sc_hs__dfsbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.v b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.v
index 3b3a7e7..215f027 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.v
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.v
@@ -53,7 +53,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__dfsbp cell (
+    sky130_fd_sc_hs__dfsbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfsbp cell (
+    sky130_fd_sc_hs__dfsbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_1.v b/cells/dfstp/sky130_fd_sc_hs__dfstp_1.v
index a2b8fa9..adb15da 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_1.v
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_1.v
@@ -51,7 +51,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__dfstp cell (
+    sky130_fd_sc_hs__dfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfstp cell (
+    sky130_fd_sc_hs__dfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_2.v b/cells/dfstp/sky130_fd_sc_hs__dfstp_2.v
index a95966e..ba5fdd9 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_2.v
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_2.v
@@ -51,7 +51,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__dfstp cell (
+    sky130_fd_sc_hs__dfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfstp cell (
+    sky130_fd_sc_hs__dfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_4.v b/cells/dfstp/sky130_fd_sc_hs__dfstp_4.v
index 957402a..07ba85b 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_4.v
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_4.v
@@ -51,7 +51,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__dfstp cell (
+    sky130_fd_sc_hs__dfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfstp cell (
+    sky130_fd_sc_hs__dfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.v b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.v
index f8b1c1f..e05938a 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.v
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.v
@@ -51,7 +51,7 @@
     output Q_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dfxbp cell (
+    sky130_fd_sc_hs__dfxbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfxbp cell (
+    sky130_fd_sc_hs__dfxbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.v b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.v
index 0346847..b377bb0 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.v
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.v
@@ -51,7 +51,7 @@
     output Q_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dfxbp cell (
+    sky130_fd_sc_hs__dfxbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfxbp cell (
+    sky130_fd_sc_hs__dfxbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.v b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.v
index 5c4b6a4..2485df8 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.v
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.v
@@ -49,7 +49,7 @@
     output Q   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dfxtp cell (
+    sky130_fd_sc_hs__dfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfxtp cell (
+    sky130_fd_sc_hs__dfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q)
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.v b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.v
index 8fb662f..d9e7645 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.v
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.v
@@ -49,7 +49,7 @@
     output Q   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dfxtp cell (
+    sky130_fd_sc_hs__dfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfxtp cell (
+    sky130_fd_sc_hs__dfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q)
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.v b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.v
index 26f81b6..92b45c5 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.v
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.v
@@ -49,7 +49,7 @@
     output Q   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dfxtp cell (
+    sky130_fd_sc_hs__dfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dfxtp cell (
+    sky130_fd_sc_hs__dfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q)
diff --git a/cells/diode/sky130_fd_sc_hs__diode_2.v b/cells/diode/sky130_fd_sc_hs__diode_2.v
index ead2bd5..04bde83 100644
--- a/cells/diode/sky130_fd_sc_hs__diode_2.v
+++ b/cells/diode/sky130_fd_sc_hs__diode_2.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hs__diode cell (
+    sky130_fd_sc_hs__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hs__diode cell (
+    sky130_fd_sc_hs__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.v b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.v
index c5fff23..9fa65c1 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.v
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.v
@@ -49,7 +49,7 @@
     input  CLK ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlclkp cell (
+    sky130_fd_sc_hs__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlclkp cell (
+    sky130_fd_sc_hs__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.v b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.v
index 5403ec3..5a198dd 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.v
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.v
@@ -49,7 +49,7 @@
     input  CLK ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlclkp cell (
+    sky130_fd_sc_hs__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlclkp cell (
+    sky130_fd_sc_hs__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.v b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.v
index e769b65..7b7b64a 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.v
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.v
@@ -49,7 +49,7 @@
     input  CLK ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlclkp cell (
+    sky130_fd_sc_hs__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlclkp cell (
+    sky130_fd_sc_hs__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.v b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.v
index ee3f28c..18fc3a4 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.v
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.v
@@ -54,7 +54,7 @@
     output Q_N    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrbn cell (
+    sky130_fd_sc_hs__dlrbn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
@@ -94,7 +94,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrbn cell (
+    sky130_fd_sc_hs__dlrbn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.v b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.v
index 9e67842..9d77cb0 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.v
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.v
@@ -54,7 +54,7 @@
     output Q_N    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrbn cell (
+    sky130_fd_sc_hs__dlrbn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
@@ -94,7 +94,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrbn cell (
+    sky130_fd_sc_hs__dlrbn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.v b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.v
index b5cf0b4..1eb6fba 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.v
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.v
@@ -54,7 +54,7 @@
     output Q_N    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrbp cell (
+    sky130_fd_sc_hs__dlrbp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
@@ -94,7 +94,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrbp cell (
+    sky130_fd_sc_hs__dlrbp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.v b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.v
index ee9ccd5..4b2e772 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.v
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.v
@@ -54,7 +54,7 @@
     output Q_N    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrbp cell (
+    sky130_fd_sc_hs__dlrbp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
@@ -94,7 +94,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrbp cell (
+    sky130_fd_sc_hs__dlrbp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.v b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.v
index 51c4b1b..980fa1d 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.v
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.v
@@ -51,7 +51,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrtn cell (
+    sky130_fd_sc_hs__dlrtn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrtn cell (
+    sky130_fd_sc_hs__dlrtn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.v b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.v
index 0789b96..ca6eba4 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.v
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.v
@@ -51,7 +51,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrtn cell (
+    sky130_fd_sc_hs__dlrtn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrtn cell (
+    sky130_fd_sc_hs__dlrtn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.v b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.v
index 9f0f8d7..fd4a851 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.v
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.v
@@ -51,7 +51,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrtn cell (
+    sky130_fd_sc_hs__dlrtn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrtn cell (
+    sky130_fd_sc_hs__dlrtn base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE_N(GATE_N),
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.v b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.v
index 25201d7..2304267 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.v
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.v
@@ -52,7 +52,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrtp cell (
+    sky130_fd_sc_hs__dlrtp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
@@ -89,7 +89,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrtp cell (
+    sky130_fd_sc_hs__dlrtp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.v b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.v
index fe0a2cd..4a75f65 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.v
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.v
@@ -52,7 +52,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrtp cell (
+    sky130_fd_sc_hs__dlrtp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
@@ -89,7 +89,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrtp cell (
+    sky130_fd_sc_hs__dlrtp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.v b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.v
index c6c953f..2879bfc 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.v
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.v
@@ -52,7 +52,7 @@
     output Q      ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__dlrtp cell (
+    sky130_fd_sc_hs__dlrtp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
@@ -89,7 +89,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlrtp cell (
+    sky130_fd_sc_hs__dlrtp base (
         .RESET_B(RESET_B),
         .D(D),
         .GATE(GATE),
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.v b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.v
index f4577a6..398ba1a 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.v
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.v
@@ -51,7 +51,7 @@
     input  GATE_N;
     input  VPWR  ;
     input  VGND  ;
-    sky130_fd_sc_hs__dlxbn cell (
+    sky130_fd_sc_hs__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlxbn cell (
+    sky130_fd_sc_hs__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.v b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.v
index e171e5a..a3089ca 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.v
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.v
@@ -51,7 +51,7 @@
     input  GATE_N;
     input  VPWR  ;
     input  VGND  ;
-    sky130_fd_sc_hs__dlxbn cell (
+    sky130_fd_sc_hs__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlxbn cell (
+    sky130_fd_sc_hs__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.v b/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.v
index 6207adb..992013c 100644
--- a/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.v
+++ b/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.v
@@ -51,7 +51,7 @@
     input  GATE;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlxbp cell (
+    sky130_fd_sc_hs__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlxbp cell (
+    sky130_fd_sc_hs__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.v b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.v
index 4dbed31..3ed955e 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.v
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.v
@@ -49,7 +49,7 @@
     input  GATE_N;
     input  VPWR  ;
     input  VGND  ;
-    sky130_fd_sc_hs__dlxtn cell (
+    sky130_fd_sc_hs__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlxtn cell (
+    sky130_fd_sc_hs__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.v b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.v
index 66fcadc..d60f093 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.v
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.v
@@ -49,7 +49,7 @@
     input  GATE_N;
     input  VPWR  ;
     input  VGND  ;
-    sky130_fd_sc_hs__dlxtn cell (
+    sky130_fd_sc_hs__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlxtn cell (
+    sky130_fd_sc_hs__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.v b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.v
index 0990c7c..a24a7c6 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.v
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.v
@@ -49,7 +49,7 @@
     input  GATE_N;
     input  VPWR  ;
     input  VGND  ;
-    sky130_fd_sc_hs__dlxtn cell (
+    sky130_fd_sc_hs__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlxtn cell (
+    sky130_fd_sc_hs__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.v b/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.v
index 027823e..671dcd8 100644
--- a/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.v
+++ b/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.v
@@ -49,7 +49,7 @@
     input  GATE;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlxtp cell (
+    sky130_fd_sc_hs__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlxtp cell (
+    sky130_fd_sc_hs__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE)
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.v b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.v
index bbfca56..523fda2 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlygate4sd1 cell (
+    sky130_fd_sc_hs__dlygate4sd1 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlygate4sd1 cell (
+    sky130_fd_sc_hs__dlygate4sd1 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.v b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.v
index 5077ad9..98e6bfc 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlygate4sd2 cell (
+    sky130_fd_sc_hs__dlygate4sd2 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlygate4sd2 cell (
+    sky130_fd_sc_hs__dlygate4sd2 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.v b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.v
index d60bcb9..c913859 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlygate4sd3 cell (
+    sky130_fd_sc_hs__dlygate4sd3 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlygate4sd3 cell (
+    sky130_fd_sc_hs__dlygate4sd3 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.v b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.v
index a8072a1..38c4e69 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlymetal6s2s cell (
+    sky130_fd_sc_hs__dlymetal6s2s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlymetal6s2s cell (
+    sky130_fd_sc_hs__dlymetal6s2s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.v b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.v
index a57b2af..f8b4ac9 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlymetal6s4s cell (
+    sky130_fd_sc_hs__dlymetal6s4s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlymetal6s4s cell (
+    sky130_fd_sc_hs__dlymetal6s4s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.v b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.v
index f06a0be..d21d3ba 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.v
@@ -48,7 +48,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__dlymetal6s6s cell (
+    sky130_fd_sc_hs__dlymetal6s6s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -79,7 +79,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__dlymetal6s6s cell (
+    sky130_fd_sc_hs__dlymetal6s6s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_1.v b/cells/ebufn/sky130_fd_sc_hs__ebufn_1.v
index ba766c7..5dbb2d0 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_1.v
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_1.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__ebufn cell (
+    sky130_fd_sc_hs__ebufn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__ebufn cell (
+    sky130_fd_sc_hs__ebufn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z)
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_2.v b/cells/ebufn/sky130_fd_sc_hs__ebufn_2.v
index b7026fb..8309284 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_2.v
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_2.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__ebufn cell (
+    sky130_fd_sc_hs__ebufn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__ebufn cell (
+    sky130_fd_sc_hs__ebufn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z)
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_4.v b/cells/ebufn/sky130_fd_sc_hs__ebufn_4.v
index 77825ea..f510264 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_4.v
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_4.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__ebufn cell (
+    sky130_fd_sc_hs__ebufn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__ebufn cell (
+    sky130_fd_sc_hs__ebufn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z)
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_8.v b/cells/ebufn/sky130_fd_sc_hs__ebufn_8.v
index 8a4d355..16104ac 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_8.v
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_8.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__ebufn cell (
+    sky130_fd_sc_hs__ebufn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__ebufn cell (
+    sky130_fd_sc_hs__ebufn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z)
diff --git a/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.v b/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.v
index 82646dc..dba40fb 100644
--- a/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.v
+++ b/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.v
@@ -54,7 +54,7 @@
     input  DE  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__edfxbp cell (
+    sky130_fd_sc_hs__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -94,7 +94,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__edfxbp cell (
+    sky130_fd_sc_hs__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.v b/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.v
index 221b3bf..06ef506 100644
--- a/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.v
+++ b/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.v
@@ -52,7 +52,7 @@
     input  DE  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__edfxtp cell (
+    sky130_fd_sc_hs__edfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -89,7 +89,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__edfxtp cell (
+    sky130_fd_sc_hs__edfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_1.v b/cells/einvn/sky130_fd_sc_hs__einvn_1.v
index b250bc4..2ad6705 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_1.v
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_1.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__einvn cell (
+    sky130_fd_sc_hs__einvn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__einvn cell (
+    sky130_fd_sc_hs__einvn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z)
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_2.v b/cells/einvn/sky130_fd_sc_hs__einvn_2.v
index 830c22f..660c2d9 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_2.v
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_2.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__einvn cell (
+    sky130_fd_sc_hs__einvn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__einvn cell (
+    sky130_fd_sc_hs__einvn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z)
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_4.v b/cells/einvn/sky130_fd_sc_hs__einvn_4.v
index c09d3b7..4ba91ae 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_4.v
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_4.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__einvn cell (
+    sky130_fd_sc_hs__einvn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__einvn cell (
+    sky130_fd_sc_hs__einvn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z)
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_8.v b/cells/einvn/sky130_fd_sc_hs__einvn_8.v
index 2582c49..8940e11 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_8.v
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_8.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__einvn cell (
+    sky130_fd_sc_hs__einvn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__einvn cell (
+    sky130_fd_sc_hs__einvn base (
         .A(A),
         .TE_B(TE_B),
         .Z(Z)
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_1.v b/cells/einvp/sky130_fd_sc_hs__einvp_1.v
index b3c16b7..5e531dc 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_1.v
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_1.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__einvp cell (
+    sky130_fd_sc_hs__einvp base (
         .A(A),
         .TE(TE),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__einvp cell (
+    sky130_fd_sc_hs__einvp base (
         .A(A),
         .TE(TE),
         .Z(Z)
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_2.v b/cells/einvp/sky130_fd_sc_hs__einvp_2.v
index eccee71..6b2fc96 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_2.v
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_2.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__einvp cell (
+    sky130_fd_sc_hs__einvp base (
         .A(A),
         .TE(TE),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__einvp cell (
+    sky130_fd_sc_hs__einvp base (
         .A(A),
         .TE(TE),
         .Z(Z)
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_4.v b/cells/einvp/sky130_fd_sc_hs__einvp_4.v
index 94296f5..d88ff38 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_4.v
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_4.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__einvp cell (
+    sky130_fd_sc_hs__einvp base (
         .A(A),
         .TE(TE),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__einvp cell (
+    sky130_fd_sc_hs__einvp base (
         .A(A),
         .TE(TE),
         .Z(Z)
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_8.v b/cells/einvp/sky130_fd_sc_hs__einvp_8.v
index aadb1e2..74f7d6c 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_8.v
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_8.v
@@ -49,7 +49,7 @@
     output Z   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__einvp cell (
+    sky130_fd_sc_hs__einvp base (
         .A(A),
         .TE(TE),
         .Z(Z),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__einvp cell (
+    sky130_fd_sc_hs__einvp base (
         .A(A),
         .TE(TE),
         .Z(Z)
diff --git a/cells/fa/sky130_fd_sc_hs__fa_1.v b/cells/fa/sky130_fd_sc_hs__fa_1.v
index fbc7c45..8768ddb 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_1.v
+++ b/cells/fa/sky130_fd_sc_hs__fa_1.v
@@ -53,7 +53,7 @@
     input  CIN ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__fa cell (
+    sky130_fd_sc_hs__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__fa cell (
+    sky130_fd_sc_hs__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_hs__fa_2.v b/cells/fa/sky130_fd_sc_hs__fa_2.v
index 2efc36b..eae2b4e 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_2.v
+++ b/cells/fa/sky130_fd_sc_hs__fa_2.v
@@ -53,7 +53,7 @@
     input  CIN ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__fa cell (
+    sky130_fd_sc_hs__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__fa cell (
+    sky130_fd_sc_hs__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_hs__fa_4.v b/cells/fa/sky130_fd_sc_hs__fa_4.v
index ae55417..6d3a4c1 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_4.v
+++ b/cells/fa/sky130_fd_sc_hs__fa_4.v
@@ -53,7 +53,7 @@
     input  CIN ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__fa cell (
+    sky130_fd_sc_hs__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__fa cell (
+    sky130_fd_sc_hs__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_hs__fah_1.v b/cells/fah/sky130_fd_sc_hs__fah_1.v
index 057f9bb..bb78f57 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_1.v
+++ b/cells/fah/sky130_fd_sc_hs__fah_1.v
@@ -53,7 +53,7 @@
     input  CI  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__fah cell (
+    sky130_fd_sc_hs__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__fah cell (
+    sky130_fd_sc_hs__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_hs__fah_2.v b/cells/fah/sky130_fd_sc_hs__fah_2.v
index 04bfa69..e55b265 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_2.v
+++ b/cells/fah/sky130_fd_sc_hs__fah_2.v
@@ -53,7 +53,7 @@
     input  CI  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__fah cell (
+    sky130_fd_sc_hs__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__fah cell (
+    sky130_fd_sc_hs__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_hs__fah_4.v b/cells/fah/sky130_fd_sc_hs__fah_4.v
index 17e2182..18e17fd 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_4.v
+++ b/cells/fah/sky130_fd_sc_hs__fah_4.v
@@ -53,7 +53,7 @@
     input  CI  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__fah cell (
+    sky130_fd_sc_hs__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__fah cell (
+    sky130_fd_sc_hs__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcin/sky130_fd_sc_hs__fahcin_1.v b/cells/fahcin/sky130_fd_sc_hs__fahcin_1.v
index d0d6051..e6d2f5e 100644
--- a/cells/fahcin/sky130_fd_sc_hs__fahcin_1.v
+++ b/cells/fahcin/sky130_fd_sc_hs__fahcin_1.v
@@ -53,7 +53,7 @@
     input  CIN ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__fahcin cell (
+    sky130_fd_sc_hs__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__fahcin cell (
+    sky130_fd_sc_hs__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcon/sky130_fd_sc_hs__fahcon_1.v b/cells/fahcon/sky130_fd_sc_hs__fahcon_1.v
index 2af637b..da6e152 100644
--- a/cells/fahcon/sky130_fd_sc_hs__fahcon_1.v
+++ b/cells/fahcon/sky130_fd_sc_hs__fahcon_1.v
@@ -53,7 +53,7 @@
     input  CI    ;
     input  VPWR  ;
     input  VGND  ;
-    sky130_fd_sc_hs__fahcon cell (
+    sky130_fd_sc_hs__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__fahcon cell (
+    sky130_fd_sc_hs__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fill/sky130_fd_sc_hs__fill_1.v b/cells/fill/sky130_fd_sc_hs__fill_1.v
index 794c1c9..9087099 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_1.v
+++ b/cells/fill/sky130_fd_sc_hs__fill_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hs__fill cell (
+    sky130_fd_sc_hs__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hs__fill cell ();
+    sky130_fd_sc_hs__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hs__fill_2.v b/cells/fill/sky130_fd_sc_hs__fill_2.v
index e9d4184..656c3d6 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_2.v
+++ b/cells/fill/sky130_fd_sc_hs__fill_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hs__fill cell (
+    sky130_fd_sc_hs__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hs__fill cell ();
+    sky130_fd_sc_hs__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hs__fill_4.v b/cells/fill/sky130_fd_sc_hs__fill_4.v
index 76ce196..3eccbda 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_4.v
+++ b/cells/fill/sky130_fd_sc_hs__fill_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hs__fill cell (
+    sky130_fd_sc_hs__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hs__fill cell ();
+    sky130_fd_sc_hs__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hs__fill_8.v b/cells/fill/sky130_fd_sc_hs__fill_8.v
index be01627..c91507e 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_8.v
+++ b/cells/fill/sky130_fd_sc_hs__fill_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hs__fill cell (
+    sky130_fd_sc_hs__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hs__fill cell ();
+    sky130_fd_sc_hs__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.v b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.v
index 3f5bab6..466da33 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.v
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hs__fill_diode cell (
+    sky130_fd_sc_hs__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hs__fill_diode cell ();
+    sky130_fd_sc_hs__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.v b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.v
index 622d25c..3a28946 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.v
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hs__fill_diode cell (
+    sky130_fd_sc_hs__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hs__fill_diode cell ();
+    sky130_fd_sc_hs__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.v b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.v
index 2b394b4..f83f47b 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.v
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hs__fill_diode cell (
+    sky130_fd_sc_hs__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hs__fill_diode cell ();
+    sky130_fd_sc_hs__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/ha/sky130_fd_sc_hs__ha_1.v b/cells/ha/sky130_fd_sc_hs__ha_1.v
index 0c48d34..63deba8 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_1.v
+++ b/cells/ha/sky130_fd_sc_hs__ha_1.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__ha cell (
+    sky130_fd_sc_hs__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__ha cell (
+    sky130_fd_sc_hs__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_hs__ha_2.v b/cells/ha/sky130_fd_sc_hs__ha_2.v
index 2e29442..6b45b1e 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_2.v
+++ b/cells/ha/sky130_fd_sc_hs__ha_2.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__ha cell (
+    sky130_fd_sc_hs__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__ha cell (
+    sky130_fd_sc_hs__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_hs__ha_4.v b/cells/ha/sky130_fd_sc_hs__ha_4.v
index 2c8ddf4..919edf9 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_4.v
+++ b/cells/ha/sky130_fd_sc_hs__ha_4.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__ha cell (
+    sky130_fd_sc_hs__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__ha cell (
+    sky130_fd_sc_hs__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/inv/sky130_fd_sc_hs__inv_1.v b/cells/inv/sky130_fd_sc_hs__inv_1.v
index c7ba55b..6e94dcf 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_1.v
+++ b/cells/inv/sky130_fd_sc_hs__inv_1.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hs__inv_16.v b/cells/inv/sky130_fd_sc_hs__inv_16.v
index 616125f..ca097fd 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_16.v
+++ b/cells/inv/sky130_fd_sc_hs__inv_16.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hs__inv_2.v b/cells/inv/sky130_fd_sc_hs__inv_2.v
index 2f8fe83..1970abc 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_2.v
+++ b/cells/inv/sky130_fd_sc_hs__inv_2.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hs__inv_4.v b/cells/inv/sky130_fd_sc_hs__inv_4.v
index c1db578..32da34d 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_4.v
+++ b/cells/inv/sky130_fd_sc_hs__inv_4.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hs__inv_8.v b/cells/inv/sky130_fd_sc_hs__inv_8.v
index f717b4a..8583339 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_8.v
+++ b/cells/inv/sky130_fd_sc_hs__inv_8.v
@@ -47,7 +47,7 @@
     input  A   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -78,7 +78,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__inv cell (
+    sky130_fd_sc_hs__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_1.v b/cells/maj3/sky130_fd_sc_hs__maj3_1.v
index 5894681..5a7379b 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_1.v
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_1.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__maj3 cell (
+    sky130_fd_sc_hs__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__maj3 cell (
+    sky130_fd_sc_hs__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_2.v b/cells/maj3/sky130_fd_sc_hs__maj3_2.v
index 98c942e..f00347e 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_2.v
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_2.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__maj3 cell (
+    sky130_fd_sc_hs__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__maj3 cell (
+    sky130_fd_sc_hs__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_4.v b/cells/maj3/sky130_fd_sc_hs__maj3_4.v
index 8eb1200..c302fc6 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_4.v
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_4.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__maj3 cell (
+    sky130_fd_sc_hs__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__maj3 cell (
+    sky130_fd_sc_hs__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_1.v b/cells/mux2/sky130_fd_sc_hs__mux2_1.v
index 7dbf762..187ba42 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_1.v
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_1.v
@@ -51,7 +51,7 @@
     input  S   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux2 cell (
+    sky130_fd_sc_hs__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux2 cell (
+    sky130_fd_sc_hs__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_2.v b/cells/mux2/sky130_fd_sc_hs__mux2_2.v
index 84ac69f..358cebe 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_2.v
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_2.v
@@ -51,7 +51,7 @@
     input  S   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux2 cell (
+    sky130_fd_sc_hs__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux2 cell (
+    sky130_fd_sc_hs__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_4.v b/cells/mux2/sky130_fd_sc_hs__mux2_4.v
index 9fb1096..b262bdd 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_4.v
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_4.v
@@ -51,7 +51,7 @@
     input  S   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux2 cell (
+    sky130_fd_sc_hs__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux2 cell (
+    sky130_fd_sc_hs__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_1.v b/cells/mux2i/sky130_fd_sc_hs__mux2i_1.v
index 4952e60..f60138d 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_1.v
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_1.v
@@ -51,7 +51,7 @@
     input  S   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux2i cell (
+    sky130_fd_sc_hs__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux2i cell (
+    sky130_fd_sc_hs__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_2.v b/cells/mux2i/sky130_fd_sc_hs__mux2i_2.v
index 03ecd76..ee37fbf 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_2.v
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_2.v
@@ -51,7 +51,7 @@
     input  S   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux2i cell (
+    sky130_fd_sc_hs__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux2i cell (
+    sky130_fd_sc_hs__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_4.v b/cells/mux2i/sky130_fd_sc_hs__mux2i_4.v
index b706b07..3cc4a79 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_4.v
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_4.v
@@ -51,7 +51,7 @@
     input  S   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux2i cell (
+    sky130_fd_sc_hs__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux2i cell (
+    sky130_fd_sc_hs__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_1.v b/cells/mux4/sky130_fd_sc_hs__mux4_1.v
index 925ab57..31ddb8c 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_1.v
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_1.v
@@ -57,7 +57,7 @@
     input  S1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux4 cell (
+    sky130_fd_sc_hs__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -103,7 +103,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux4 cell (
+    sky130_fd_sc_hs__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_2.v b/cells/mux4/sky130_fd_sc_hs__mux4_2.v
index 82c4a7e..72da244 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_2.v
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_2.v
@@ -57,7 +57,7 @@
     input  S1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux4 cell (
+    sky130_fd_sc_hs__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -103,7 +103,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux4 cell (
+    sky130_fd_sc_hs__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_4.v b/cells/mux4/sky130_fd_sc_hs__mux4_4.v
index ec0c6ff..039eb7d 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_4.v
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_4.v
@@ -57,7 +57,7 @@
     input  S1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__mux4 cell (
+    sky130_fd_sc_hs__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -103,7 +103,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__mux4 cell (
+    sky130_fd_sc_hs__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_1.v b/cells/nand2/sky130_fd_sc_hs__nand2_1.v
index a3655e7..51f50ed 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_1.v
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_1.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand2 cell (
+    sky130_fd_sc_hs__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand2 cell (
+    sky130_fd_sc_hs__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_2.v b/cells/nand2/sky130_fd_sc_hs__nand2_2.v
index bf8e33b..9b3a0d2 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_2.v
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_2.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand2 cell (
+    sky130_fd_sc_hs__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand2 cell (
+    sky130_fd_sc_hs__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_4.v b/cells/nand2/sky130_fd_sc_hs__nand2_4.v
index 69f963d..380de40 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_4.v
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_4.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand2 cell (
+    sky130_fd_sc_hs__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand2 cell (
+    sky130_fd_sc_hs__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_8.v b/cells/nand2/sky130_fd_sc_hs__nand2_8.v
index 9a45e49..4fe07e6 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_8.v
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_8.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand2 cell (
+    sky130_fd_sc_hs__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand2 cell (
+    sky130_fd_sc_hs__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_1.v b/cells/nand2b/sky130_fd_sc_hs__nand2b_1.v
index 79e54fe..c7519b1 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_1.v
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_1.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand2b cell (
+    sky130_fd_sc_hs__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand2b cell (
+    sky130_fd_sc_hs__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_2.v b/cells/nand2b/sky130_fd_sc_hs__nand2b_2.v
index 0eb8f55..493d5c9 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_2.v
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_2.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand2b cell (
+    sky130_fd_sc_hs__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand2b cell (
+    sky130_fd_sc_hs__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_4.v b/cells/nand2b/sky130_fd_sc_hs__nand2b_4.v
index 1552514..1d26c0d 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_4.v
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_4.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand2b cell (
+    sky130_fd_sc_hs__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand2b cell (
+    sky130_fd_sc_hs__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_1.v b/cells/nand3/sky130_fd_sc_hs__nand3_1.v
index 3e57db5..4bd98f0 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_1.v
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_1.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand3 cell (
+    sky130_fd_sc_hs__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand3 cell (
+    sky130_fd_sc_hs__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_2.v b/cells/nand3/sky130_fd_sc_hs__nand3_2.v
index db9ab7c..b4194da 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_2.v
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_2.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand3 cell (
+    sky130_fd_sc_hs__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand3 cell (
+    sky130_fd_sc_hs__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_4.v b/cells/nand3/sky130_fd_sc_hs__nand3_4.v
index f677dda..4c5ea94 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_4.v
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_4.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand3 cell (
+    sky130_fd_sc_hs__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand3 cell (
+    sky130_fd_sc_hs__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_1.v b/cells/nand3b/sky130_fd_sc_hs__nand3b_1.v
index 4b798a4..910cfa3 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_1.v
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_1.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand3b cell (
+    sky130_fd_sc_hs__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand3b cell (
+    sky130_fd_sc_hs__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_2.v b/cells/nand3b/sky130_fd_sc_hs__nand3b_2.v
index 184f66f..d20fa14 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_2.v
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_2.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand3b cell (
+    sky130_fd_sc_hs__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand3b cell (
+    sky130_fd_sc_hs__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_4.v b/cells/nand3b/sky130_fd_sc_hs__nand3b_4.v
index 285f409..a32c0d6 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_4.v
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_4.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand3b cell (
+    sky130_fd_sc_hs__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand3b cell (
+    sky130_fd_sc_hs__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_1.v b/cells/nand4/sky130_fd_sc_hs__nand4_1.v
index e08bbda..31d2c84 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_1.v
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_1.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4 cell (
+    sky130_fd_sc_hs__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4 cell (
+    sky130_fd_sc_hs__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_2.v b/cells/nand4/sky130_fd_sc_hs__nand4_2.v
index 9222342..bf5bff5 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_2.v
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_2.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4 cell (
+    sky130_fd_sc_hs__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4 cell (
+    sky130_fd_sc_hs__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_4.v b/cells/nand4/sky130_fd_sc_hs__nand4_4.v
index aa049c1..cefd7df 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_4.v
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_4.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4 cell (
+    sky130_fd_sc_hs__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4 cell (
+    sky130_fd_sc_hs__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_1.v b/cells/nand4b/sky130_fd_sc_hs__nand4b_1.v
index 27bf9a3..2f261a1 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_1.v
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_1.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4b cell (
+    sky130_fd_sc_hs__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4b cell (
+    sky130_fd_sc_hs__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_2.v b/cells/nand4b/sky130_fd_sc_hs__nand4b_2.v
index 3711844..a7126d87 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_2.v
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_2.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4b cell (
+    sky130_fd_sc_hs__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4b cell (
+    sky130_fd_sc_hs__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_4.v b/cells/nand4b/sky130_fd_sc_hs__nand4b_4.v
index 692a7f8..c3cef8c 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_4.v
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_4.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4b cell (
+    sky130_fd_sc_hs__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4b cell (
+    sky130_fd_sc_hs__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.v b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.v
index 10b4ee4..2506b9e 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.v
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4bb cell (
+    sky130_fd_sc_hs__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4bb cell (
+    sky130_fd_sc_hs__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.v b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.v
index bc9f161..88596df 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.v
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4bb cell (
+    sky130_fd_sc_hs__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4bb cell (
+    sky130_fd_sc_hs__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.v b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.v
index 81e46b2..3218d8e 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.v
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nand4bb cell (
+    sky130_fd_sc_hs__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nand4bb cell (
+    sky130_fd_sc_hs__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_1.v b/cells/nor2/sky130_fd_sc_hs__nor2_1.v
index 297951d..c13609f 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_1.v
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_1.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor2 cell (
+    sky130_fd_sc_hs__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor2 cell (
+    sky130_fd_sc_hs__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_2.v b/cells/nor2/sky130_fd_sc_hs__nor2_2.v
index 9fcb538..0d6067a 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_2.v
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_2.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor2 cell (
+    sky130_fd_sc_hs__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor2 cell (
+    sky130_fd_sc_hs__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_4.v b/cells/nor2/sky130_fd_sc_hs__nor2_4.v
index 6672c74..058f12d 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_4.v
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_4.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor2 cell (
+    sky130_fd_sc_hs__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor2 cell (
+    sky130_fd_sc_hs__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_8.v b/cells/nor2/sky130_fd_sc_hs__nor2_8.v
index 4ece77d..4364d20 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_8.v
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_8.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor2 cell (
+    sky130_fd_sc_hs__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor2 cell (
+    sky130_fd_sc_hs__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_1.v b/cells/nor2b/sky130_fd_sc_hs__nor2b_1.v
index d8f7f58..f20fcaf 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_1.v
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_1.v
@@ -51,7 +51,7 @@
     input  B_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor2b cell (
+    sky130_fd_sc_hs__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor2b cell (
+    sky130_fd_sc_hs__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_2.v b/cells/nor2b/sky130_fd_sc_hs__nor2b_2.v
index 19a740f..ecc68d3 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_2.v
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_2.v
@@ -51,7 +51,7 @@
     input  B_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor2b cell (
+    sky130_fd_sc_hs__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor2b cell (
+    sky130_fd_sc_hs__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_4.v b/cells/nor2b/sky130_fd_sc_hs__nor2b_4.v
index 243d023..fb10c64 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_4.v
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_4.v
@@ -51,7 +51,7 @@
     input  B_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor2b cell (
+    sky130_fd_sc_hs__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor2b cell (
+    sky130_fd_sc_hs__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_1.v b/cells/nor3/sky130_fd_sc_hs__nor3_1.v
index b7cb7b0..ca18596 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_1.v
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_1.v
@@ -53,7 +53,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor3 cell (
+    sky130_fd_sc_hs__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor3 cell (
+    sky130_fd_sc_hs__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_2.v b/cells/nor3/sky130_fd_sc_hs__nor3_2.v
index ec2d416..98689c4 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_2.v
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_2.v
@@ -53,7 +53,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor3 cell (
+    sky130_fd_sc_hs__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor3 cell (
+    sky130_fd_sc_hs__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_4.v b/cells/nor3/sky130_fd_sc_hs__nor3_4.v
index 7ae5db3..46e6f67 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_4.v
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_4.v
@@ -53,7 +53,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor3 cell (
+    sky130_fd_sc_hs__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor3 cell (
+    sky130_fd_sc_hs__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_1.v b/cells/nor3b/sky130_fd_sc_hs__nor3b_1.v
index bb99b8b..e909f84 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_1.v
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_1.v
@@ -53,7 +53,7 @@
     input  C_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor3b cell (
+    sky130_fd_sc_hs__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor3b cell (
+    sky130_fd_sc_hs__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_2.v b/cells/nor3b/sky130_fd_sc_hs__nor3b_2.v
index 64f191a..94ba79a 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_2.v
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_2.v
@@ -53,7 +53,7 @@
     input  C_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor3b cell (
+    sky130_fd_sc_hs__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor3b cell (
+    sky130_fd_sc_hs__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_4.v b/cells/nor3b/sky130_fd_sc_hs__nor3b_4.v
index 1e09483..5c1bd1b 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_4.v
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_4.v
@@ -53,7 +53,7 @@
     input  C_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor3b cell (
+    sky130_fd_sc_hs__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor3b cell (
+    sky130_fd_sc_hs__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_1.v b/cells/nor4/sky130_fd_sc_hs__nor4_1.v
index 363d10a..fc81ce0 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_1.v
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_1.v
@@ -55,7 +55,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4 cell (
+    sky130_fd_sc_hs__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4 cell (
+    sky130_fd_sc_hs__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_2.v b/cells/nor4/sky130_fd_sc_hs__nor4_2.v
index abbd22c..07028c6 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_2.v
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_2.v
@@ -55,7 +55,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4 cell (
+    sky130_fd_sc_hs__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4 cell (
+    sky130_fd_sc_hs__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_4.v b/cells/nor4/sky130_fd_sc_hs__nor4_4.v
index c11e81c..663935d 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_4.v
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_4.v
@@ -55,7 +55,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4 cell (
+    sky130_fd_sc_hs__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4 cell (
+    sky130_fd_sc_hs__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_1.v b/cells/nor4b/sky130_fd_sc_hs__nor4b_1.v
index 0cf8076..1aab004 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_1.v
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_1.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4b cell (
+    sky130_fd_sc_hs__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4b cell (
+    sky130_fd_sc_hs__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_2.v b/cells/nor4b/sky130_fd_sc_hs__nor4b_2.v
index 357fe50..90f9776 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_2.v
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_2.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4b cell (
+    sky130_fd_sc_hs__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4b cell (
+    sky130_fd_sc_hs__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_4.v b/cells/nor4b/sky130_fd_sc_hs__nor4b_4.v
index 601eaec..c03589a 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_4.v
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_4.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4b cell (
+    sky130_fd_sc_hs__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4b cell (
+    sky130_fd_sc_hs__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.v b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.v
index 6ce7040..294d7c6 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.v
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4bb cell (
+    sky130_fd_sc_hs__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4bb cell (
+    sky130_fd_sc_hs__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.v b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.v
index 6de7982..c8c45eb 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.v
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4bb cell (
+    sky130_fd_sc_hs__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4bb cell (
+    sky130_fd_sc_hs__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.v b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.v
index 9440b8b..2d8fb7b 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.v
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__nor4bb cell (
+    sky130_fd_sc_hs__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__nor4bb cell (
+    sky130_fd_sc_hs__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_1.v b/cells/o2111a/sky130_fd_sc_hs__o2111a_1.v
index b6e339b..dc3ee4b 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_1.v
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_1.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2111a cell (
+    sky130_fd_sc_hs__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2111a cell (
+    sky130_fd_sc_hs__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_2.v b/cells/o2111a/sky130_fd_sc_hs__o2111a_2.v
index cba5ed8..44aa4cf 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_2.v
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_2.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2111a cell (
+    sky130_fd_sc_hs__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2111a cell (
+    sky130_fd_sc_hs__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_4.v b/cells/o2111a/sky130_fd_sc_hs__o2111a_4.v
index 33cc622..e20398e 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_4.v
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_4.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2111a cell (
+    sky130_fd_sc_hs__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2111a cell (
+    sky130_fd_sc_hs__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.v b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.v
index ede7b6e..91b753c 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.v
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2111ai cell (
+    sky130_fd_sc_hs__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2111ai cell (
+    sky130_fd_sc_hs__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.v b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.v
index afa1236..6d9bd42 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.v
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2111ai cell (
+    sky130_fd_sc_hs__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2111ai cell (
+    sky130_fd_sc_hs__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.v b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.v
index 08a328a..d5fd18a 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.v
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.v
@@ -57,7 +57,7 @@
     input  D1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2111ai cell (
+    sky130_fd_sc_hs__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2111ai cell (
+    sky130_fd_sc_hs__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_1.v b/cells/o211a/sky130_fd_sc_hs__o211a_1.v
index 199b879..634f6bb 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_1.v
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_1.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o211a cell (
+    sky130_fd_sc_hs__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o211a cell (
+    sky130_fd_sc_hs__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_2.v b/cells/o211a/sky130_fd_sc_hs__o211a_2.v
index b994ce3..d73948f 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_2.v
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_2.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o211a cell (
+    sky130_fd_sc_hs__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o211a cell (
+    sky130_fd_sc_hs__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_4.v b/cells/o211a/sky130_fd_sc_hs__o211a_4.v
index 192170e..240e312 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_4.v
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_4.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o211a cell (
+    sky130_fd_sc_hs__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o211a cell (
+    sky130_fd_sc_hs__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_1.v b/cells/o211ai/sky130_fd_sc_hs__o211ai_1.v
index af0df3f..1bb2e4c 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_1.v
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_1.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o211ai cell (
+    sky130_fd_sc_hs__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o211ai cell (
+    sky130_fd_sc_hs__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_2.v b/cells/o211ai/sky130_fd_sc_hs__o211ai_2.v
index 1b18c97..eec1cfe 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_2.v
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_2.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o211ai cell (
+    sky130_fd_sc_hs__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o211ai cell (
+    sky130_fd_sc_hs__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_4.v b/cells/o211ai/sky130_fd_sc_hs__o211ai_4.v
index e5d9b6d..14d6a74 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_4.v
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_4.v
@@ -55,7 +55,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o211ai cell (
+    sky130_fd_sc_hs__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o211ai cell (
+    sky130_fd_sc_hs__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_1.v b/cells/o21a/sky130_fd_sc_hs__o21a_1.v
index d050e17..e10141a 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_1.v
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_1.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21a cell (
+    sky130_fd_sc_hs__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21a cell (
+    sky130_fd_sc_hs__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_2.v b/cells/o21a/sky130_fd_sc_hs__o21a_2.v
index f81e110..fc31325 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_2.v
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_2.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21a cell (
+    sky130_fd_sc_hs__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21a cell (
+    sky130_fd_sc_hs__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_4.v b/cells/o21a/sky130_fd_sc_hs__o21a_4.v
index b5e5c79..0827494 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_4.v
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_4.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21a cell (
+    sky130_fd_sc_hs__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21a cell (
+    sky130_fd_sc_hs__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_1.v b/cells/o21ai/sky130_fd_sc_hs__o21ai_1.v
index a1cf99f..f84dc4c 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_1.v
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_1.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21ai cell (
+    sky130_fd_sc_hs__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21ai cell (
+    sky130_fd_sc_hs__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_2.v b/cells/o21ai/sky130_fd_sc_hs__o21ai_2.v
index a675565..3ea7fe8 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_2.v
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_2.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21ai cell (
+    sky130_fd_sc_hs__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21ai cell (
+    sky130_fd_sc_hs__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_4.v b/cells/o21ai/sky130_fd_sc_hs__o21ai_4.v
index 8c6eaad..5e7f0aa 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_4.v
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_4.v
@@ -53,7 +53,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21ai cell (
+    sky130_fd_sc_hs__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21ai cell (
+    sky130_fd_sc_hs__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_1.v b/cells/o21ba/sky130_fd_sc_hs__o21ba_1.v
index 295a9e7..c100470 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_1.v
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_1.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21ba cell (
+    sky130_fd_sc_hs__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21ba cell (
+    sky130_fd_sc_hs__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_2.v b/cells/o21ba/sky130_fd_sc_hs__o21ba_2.v
index bd424a3..58b740f 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_2.v
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_2.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21ba cell (
+    sky130_fd_sc_hs__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21ba cell (
+    sky130_fd_sc_hs__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_4.v b/cells/o21ba/sky130_fd_sc_hs__o21ba_4.v
index d0a07ce..89c525f 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_4.v
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_4.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21ba cell (
+    sky130_fd_sc_hs__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21ba cell (
+    sky130_fd_sc_hs__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_1.v b/cells/o21bai/sky130_fd_sc_hs__o21bai_1.v
index 886d251..500eef8 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_1.v
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_1.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21bai cell (
+    sky130_fd_sc_hs__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21bai cell (
+    sky130_fd_sc_hs__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_2.v b/cells/o21bai/sky130_fd_sc_hs__o21bai_2.v
index 0d156b6..64f5400 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_2.v
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_2.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21bai cell (
+    sky130_fd_sc_hs__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21bai cell (
+    sky130_fd_sc_hs__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_4.v b/cells/o21bai/sky130_fd_sc_hs__o21bai_4.v
index 8036a71..319218c 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_4.v
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_4.v
@@ -54,7 +54,7 @@
     input  B1_N;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o21bai cell (
+    sky130_fd_sc_hs__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -91,7 +91,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o21bai cell (
+    sky130_fd_sc_hs__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_1.v b/cells/o221a/sky130_fd_sc_hs__o221a_1.v
index 520a6b4..b93df3c 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_1.v
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_1.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o221a cell (
+    sky130_fd_sc_hs__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o221a cell (
+    sky130_fd_sc_hs__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_2.v b/cells/o221a/sky130_fd_sc_hs__o221a_2.v
index 2bdda0d..d33d82b 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_2.v
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_2.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o221a cell (
+    sky130_fd_sc_hs__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o221a cell (
+    sky130_fd_sc_hs__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_4.v b/cells/o221a/sky130_fd_sc_hs__o221a_4.v
index 444e6a6..9d276cf 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_4.v
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_4.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o221a cell (
+    sky130_fd_sc_hs__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o221a cell (
+    sky130_fd_sc_hs__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_1.v b/cells/o221ai/sky130_fd_sc_hs__o221ai_1.v
index 6d55a5e..716bbfb 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_1.v
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_1.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o221ai cell (
+    sky130_fd_sc_hs__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o221ai cell (
+    sky130_fd_sc_hs__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_2.v b/cells/o221ai/sky130_fd_sc_hs__o221ai_2.v
index 6b9d777..fe81958 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_2.v
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_2.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o221ai cell (
+    sky130_fd_sc_hs__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o221ai cell (
+    sky130_fd_sc_hs__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_4.v b/cells/o221ai/sky130_fd_sc_hs__o221ai_4.v
index 0c824a2..4e45c7d 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_4.v
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_4.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o221ai cell (
+    sky130_fd_sc_hs__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o221ai cell (
+    sky130_fd_sc_hs__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_1.v b/cells/o22a/sky130_fd_sc_hs__o22a_1.v
index d6c7ec3..aa4a2a7 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_1.v
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_1.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o22a cell (
+    sky130_fd_sc_hs__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o22a cell (
+    sky130_fd_sc_hs__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_2.v b/cells/o22a/sky130_fd_sc_hs__o22a_2.v
index dfa398f..addfb13 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_2.v
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_2.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o22a cell (
+    sky130_fd_sc_hs__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o22a cell (
+    sky130_fd_sc_hs__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_4.v b/cells/o22a/sky130_fd_sc_hs__o22a_4.v
index 304ace5..e2a26a6 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_4.v
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_4.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o22a cell (
+    sky130_fd_sc_hs__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o22a cell (
+    sky130_fd_sc_hs__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_1.v b/cells/o22ai/sky130_fd_sc_hs__o22ai_1.v
index 4235bcb..0f79d8a 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_1.v
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_1.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o22ai cell (
+    sky130_fd_sc_hs__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o22ai cell (
+    sky130_fd_sc_hs__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_2.v b/cells/o22ai/sky130_fd_sc_hs__o22ai_2.v
index c806cc5..4df216d 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_2.v
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_2.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o22ai cell (
+    sky130_fd_sc_hs__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o22ai cell (
+    sky130_fd_sc_hs__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_4.v b/cells/o22ai/sky130_fd_sc_hs__o22ai_4.v
index 00d4ffa..bc75516 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_4.v
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_4.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o22ai cell (
+    sky130_fd_sc_hs__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o22ai cell (
+    sky130_fd_sc_hs__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.v b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.v
index aa7f1a2..917ea1e 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.v
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2bb2a cell (
+    sky130_fd_sc_hs__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2bb2a cell (
+    sky130_fd_sc_hs__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.v b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.v
index 02bb46f..f77d251 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.v
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2bb2a cell (
+    sky130_fd_sc_hs__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2bb2a cell (
+    sky130_fd_sc_hs__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.v b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.v
index 28c56ec..8c2cd5c 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.v
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2bb2a cell (
+    sky130_fd_sc_hs__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2bb2a cell (
+    sky130_fd_sc_hs__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.v b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.v
index e652b93..6138434 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2bb2ai cell (
+    sky130_fd_sc_hs__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2bb2ai cell (
+    sky130_fd_sc_hs__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.v b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.v
index f498c52..a2f059d 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2bb2ai cell (
+    sky130_fd_sc_hs__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2bb2ai cell (
+    sky130_fd_sc_hs__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.v b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.v
index 8dfbb5e..91b4325 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.v
@@ -55,7 +55,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o2bb2ai cell (
+    sky130_fd_sc_hs__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o2bb2ai cell (
+    sky130_fd_sc_hs__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_1.v b/cells/o311a/sky130_fd_sc_hs__o311a_1.v
index 9ceb3e1..cdff647 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_1.v
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_1.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o311a cell (
+    sky130_fd_sc_hs__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o311a cell (
+    sky130_fd_sc_hs__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_2.v b/cells/o311a/sky130_fd_sc_hs__o311a_2.v
index 11c9862..659ce44 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_2.v
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_2.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o311a cell (
+    sky130_fd_sc_hs__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o311a cell (
+    sky130_fd_sc_hs__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_4.v b/cells/o311a/sky130_fd_sc_hs__o311a_4.v
index 8839cb8..8f25f0c 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_4.v
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_4.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o311a cell (
+    sky130_fd_sc_hs__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o311a cell (
+    sky130_fd_sc_hs__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_1.v b/cells/o311ai/sky130_fd_sc_hs__o311ai_1.v
index 8321695..cac084a 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_1.v
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_1.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o311ai cell (
+    sky130_fd_sc_hs__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o311ai cell (
+    sky130_fd_sc_hs__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_2.v b/cells/o311ai/sky130_fd_sc_hs__o311ai_2.v
index 4f42e81..464c9cd 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_2.v
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_2.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o311ai cell (
+    sky130_fd_sc_hs__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o311ai cell (
+    sky130_fd_sc_hs__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_4.v b/cells/o311ai/sky130_fd_sc_hs__o311ai_4.v
index 0dbb299..d34673a 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_4.v
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_4.v
@@ -57,7 +57,7 @@
     input  C1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o311ai cell (
+    sky130_fd_sc_hs__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o311ai cell (
+    sky130_fd_sc_hs__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_1.v b/cells/o31a/sky130_fd_sc_hs__o31a_1.v
index 7271172..fd5e626 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_1.v
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_1.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o31a cell (
+    sky130_fd_sc_hs__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o31a cell (
+    sky130_fd_sc_hs__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_2.v b/cells/o31a/sky130_fd_sc_hs__o31a_2.v
index bbeee70..1d95368 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_2.v
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_2.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o31a cell (
+    sky130_fd_sc_hs__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o31a cell (
+    sky130_fd_sc_hs__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_4.v b/cells/o31a/sky130_fd_sc_hs__o31a_4.v
index 6e56308..905b973 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_4.v
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_4.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o31a cell (
+    sky130_fd_sc_hs__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o31a cell (
+    sky130_fd_sc_hs__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_1.v b/cells/o31ai/sky130_fd_sc_hs__o31ai_1.v
index 91d9442..c49bad0 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_1.v
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_1.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o31ai cell (
+    sky130_fd_sc_hs__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o31ai cell (
+    sky130_fd_sc_hs__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_2.v b/cells/o31ai/sky130_fd_sc_hs__o31ai_2.v
index faef788..490da0f 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_2.v
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_2.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o31ai cell (
+    sky130_fd_sc_hs__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o31ai cell (
+    sky130_fd_sc_hs__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_4.v b/cells/o31ai/sky130_fd_sc_hs__o31ai_4.v
index 1ec6e35..a1b6972 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_4.v
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_4.v
@@ -55,7 +55,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o31ai cell (
+    sky130_fd_sc_hs__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -95,7 +95,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o31ai cell (
+    sky130_fd_sc_hs__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_1.v b/cells/o32a/sky130_fd_sc_hs__o32a_1.v
index b37484d..3c37614 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_1.v
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_1.v
@@ -57,7 +57,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o32a cell (
+    sky130_fd_sc_hs__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o32a cell (
+    sky130_fd_sc_hs__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_2.v b/cells/o32a/sky130_fd_sc_hs__o32a_2.v
index 73b73eb..31f5b6a 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_2.v
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_2.v
@@ -57,7 +57,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o32a cell (
+    sky130_fd_sc_hs__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o32a cell (
+    sky130_fd_sc_hs__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_4.v b/cells/o32a/sky130_fd_sc_hs__o32a_4.v
index 84ebef8..02a47db 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_4.v
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_4.v
@@ -57,7 +57,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o32a cell (
+    sky130_fd_sc_hs__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o32a cell (
+    sky130_fd_sc_hs__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_1.v b/cells/o32ai/sky130_fd_sc_hs__o32ai_1.v
index ea24772..85ba088 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_1.v
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_1.v
@@ -57,7 +57,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o32ai cell (
+    sky130_fd_sc_hs__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o32ai cell (
+    sky130_fd_sc_hs__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_2.v b/cells/o32ai/sky130_fd_sc_hs__o32ai_2.v
index 3ac0ffc..7d8cdd8 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_2.v
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_2.v
@@ -57,7 +57,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o32ai cell (
+    sky130_fd_sc_hs__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o32ai cell (
+    sky130_fd_sc_hs__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_4.v b/cells/o32ai/sky130_fd_sc_hs__o32ai_4.v
index 9c460d1..54c6e72 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_4.v
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_4.v
@@ -57,7 +57,7 @@
     input  B2  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o32ai cell (
+    sky130_fd_sc_hs__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o32ai cell (
+    sky130_fd_sc_hs__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_1.v b/cells/o41a/sky130_fd_sc_hs__o41a_1.v
index 6898115..4a010cc 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_1.v
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_1.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o41a cell (
+    sky130_fd_sc_hs__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o41a cell (
+    sky130_fd_sc_hs__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_2.v b/cells/o41a/sky130_fd_sc_hs__o41a_2.v
index 9bcf7be..f57a152 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_2.v
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_2.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o41a cell (
+    sky130_fd_sc_hs__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o41a cell (
+    sky130_fd_sc_hs__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_4.v b/cells/o41a/sky130_fd_sc_hs__o41a_4.v
index 21f195a..2c9f2f6 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_4.v
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_4.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o41a cell (
+    sky130_fd_sc_hs__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o41a cell (
+    sky130_fd_sc_hs__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_1.v b/cells/o41ai/sky130_fd_sc_hs__o41ai_1.v
index 079f6e6..0590819 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_1.v
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_1.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o41ai cell (
+    sky130_fd_sc_hs__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o41ai cell (
+    sky130_fd_sc_hs__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_2.v b/cells/o41ai/sky130_fd_sc_hs__o41ai_2.v
index 761f6f2..edf8c1f 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_2.v
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_2.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o41ai cell (
+    sky130_fd_sc_hs__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o41ai cell (
+    sky130_fd_sc_hs__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_4.v b/cells/o41ai/sky130_fd_sc_hs__o41ai_4.v
index a9b795a..8b62f92 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_4.v
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_4.v
@@ -57,7 +57,7 @@
     input  B1  ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__o41ai cell (
+    sky130_fd_sc_hs__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -100,7 +100,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__o41ai cell (
+    sky130_fd_sc_hs__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/or2/sky130_fd_sc_hs__or2_1.v b/cells/or2/sky130_fd_sc_hs__or2_1.v
index 5dfd439..20f3f12 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_1.v
+++ b/cells/or2/sky130_fd_sc_hs__or2_1.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or2 cell (
+    sky130_fd_sc_hs__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or2 cell (
+    sky130_fd_sc_hs__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hs__or2_2.v b/cells/or2/sky130_fd_sc_hs__or2_2.v
index 30a418a..6a7f3e6 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_2.v
+++ b/cells/or2/sky130_fd_sc_hs__or2_2.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or2 cell (
+    sky130_fd_sc_hs__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or2 cell (
+    sky130_fd_sc_hs__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hs__or2_4.v b/cells/or2/sky130_fd_sc_hs__or2_4.v
index 630e253..cba21bd 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_4.v
+++ b/cells/or2/sky130_fd_sc_hs__or2_4.v
@@ -49,7 +49,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or2 cell (
+    sky130_fd_sc_hs__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or2 cell (
+    sky130_fd_sc_hs__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_1.v b/cells/or2b/sky130_fd_sc_hs__or2b_1.v
index df84d94..6ba73de 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_1.v
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_1.v
@@ -49,7 +49,7 @@
     input  B_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or2b cell (
+    sky130_fd_sc_hs__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or2b cell (
+    sky130_fd_sc_hs__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_2.v b/cells/or2b/sky130_fd_sc_hs__or2b_2.v
index 94f4d1f..0115d70 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_2.v
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_2.v
@@ -49,7 +49,7 @@
     input  B_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or2b cell (
+    sky130_fd_sc_hs__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or2b cell (
+    sky130_fd_sc_hs__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_4.v b/cells/or2b/sky130_fd_sc_hs__or2b_4.v
index 56b7372..2bec9e1 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_4.v
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_4.v
@@ -49,7 +49,7 @@
     input  B_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or2b cell (
+    sky130_fd_sc_hs__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -83,7 +83,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or2b cell (
+    sky130_fd_sc_hs__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or3/sky130_fd_sc_hs__or3_1.v b/cells/or3/sky130_fd_sc_hs__or3_1.v
index eaf2a33..098ba25 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_1.v
+++ b/cells/or3/sky130_fd_sc_hs__or3_1.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or3 cell (
+    sky130_fd_sc_hs__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or3 cell (
+    sky130_fd_sc_hs__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_hs__or3_2.v b/cells/or3/sky130_fd_sc_hs__or3_2.v
index 6c1e5ea..57b3e9c 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_2.v
+++ b/cells/or3/sky130_fd_sc_hs__or3_2.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or3 cell (
+    sky130_fd_sc_hs__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or3 cell (
+    sky130_fd_sc_hs__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_hs__or3_4.v b/cells/or3/sky130_fd_sc_hs__or3_4.v
index fa2e1ab..6a3da0e 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_4.v
+++ b/cells/or3/sky130_fd_sc_hs__or3_4.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or3 cell (
+    sky130_fd_sc_hs__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or3 cell (
+    sky130_fd_sc_hs__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_1.v b/cells/or3b/sky130_fd_sc_hs__or3b_1.v
index f8a5282..0c65167 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_1.v
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_1.v
@@ -51,7 +51,7 @@
     input  C_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or3b cell (
+    sky130_fd_sc_hs__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or3b cell (
+    sky130_fd_sc_hs__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_2.v b/cells/or3b/sky130_fd_sc_hs__or3b_2.v
index 5c6758c..1250fa0 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_2.v
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_2.v
@@ -51,7 +51,7 @@
     input  C_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or3b cell (
+    sky130_fd_sc_hs__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or3b cell (
+    sky130_fd_sc_hs__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_4.v b/cells/or3b/sky130_fd_sc_hs__or3b_4.v
index bb16860..36e25d3 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_4.v
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_4.v
@@ -51,7 +51,7 @@
     input  C_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or3b cell (
+    sky130_fd_sc_hs__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or3b cell (
+    sky130_fd_sc_hs__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hs__or4_1.v b/cells/or4/sky130_fd_sc_hs__or4_1.v
index ec23d65..e3b8f9b 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_1.v
+++ b/cells/or4/sky130_fd_sc_hs__or4_1.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4 cell (
+    sky130_fd_sc_hs__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4 cell (
+    sky130_fd_sc_hs__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hs__or4_2.v b/cells/or4/sky130_fd_sc_hs__or4_2.v
index 255398e..41f2c11 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_2.v
+++ b/cells/or4/sky130_fd_sc_hs__or4_2.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4 cell (
+    sky130_fd_sc_hs__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4 cell (
+    sky130_fd_sc_hs__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hs__or4_4.v b/cells/or4/sky130_fd_sc_hs__or4_4.v
index 54a63b8..1521690 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_4.v
+++ b/cells/or4/sky130_fd_sc_hs__or4_4.v
@@ -53,7 +53,7 @@
     input  D   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4 cell (
+    sky130_fd_sc_hs__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4 cell (
+    sky130_fd_sc_hs__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_1.v b/cells/or4b/sky130_fd_sc_hs__or4b_1.v
index 9369de9..6b9dfcb 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_1.v
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_1.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4b cell (
+    sky130_fd_sc_hs__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4b cell (
+    sky130_fd_sc_hs__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_2.v b/cells/or4b/sky130_fd_sc_hs__or4b_2.v
index 9bce354..ec0fb24 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_2.v
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_2.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4b cell (
+    sky130_fd_sc_hs__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4b cell (
+    sky130_fd_sc_hs__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_4.v b/cells/or4b/sky130_fd_sc_hs__or4b_4.v
index 86c9c6e..8dcefb1 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_4.v
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_4.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4b cell (
+    sky130_fd_sc_hs__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4b cell (
+    sky130_fd_sc_hs__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_1.v b/cells/or4bb/sky130_fd_sc_hs__or4bb_1.v
index 0f13fb8..0b6f8a8 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_1.v
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_1.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4bb cell (
+    sky130_fd_sc_hs__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4bb cell (
+    sky130_fd_sc_hs__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_2.v b/cells/or4bb/sky130_fd_sc_hs__or4bb_2.v
index b731cf6..b80b0f7 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_2.v
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_2.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4bb cell (
+    sky130_fd_sc_hs__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4bb cell (
+    sky130_fd_sc_hs__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_4.v b/cells/or4bb/sky130_fd_sc_hs__or4bb_4.v
index b2317c6..d381411 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_4.v
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_4.v
@@ -53,7 +53,7 @@
     input  D_N ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__or4bb cell (
+    sky130_fd_sc_hs__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__or4bb cell (
+    sky130_fd_sc_hs__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.v b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.v
index d7c594d..af14377 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.v
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.v
@@ -60,7 +60,7 @@
     input  RESET_B;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfbbn cell (
+    sky130_fd_sc_hs__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -109,7 +109,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfbbn cell (
+    sky130_fd_sc_hs__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.v b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.v
index 0f814e8..69513ed 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.v
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.v
@@ -60,7 +60,7 @@
     input  RESET_B;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfbbn cell (
+    sky130_fd_sc_hs__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -109,7 +109,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfbbn cell (
+    sky130_fd_sc_hs__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.v b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.v
index ad243e1..0cb19eb 100644
--- a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.v
+++ b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.v
@@ -60,7 +60,7 @@
     input  RESET_B;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfbbp cell (
+    sky130_fd_sc_hs__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -109,7 +109,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfbbp cell (
+    sky130_fd_sc_hs__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.v b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.v
index 6dd9984..44f3acb 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.v
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.v
@@ -58,7 +58,7 @@
     input  SCE    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfrbp cell (
+    sky130_fd_sc_hs__sdfrbp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -104,7 +104,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfrbp cell (
+    sky130_fd_sc_hs__sdfrbp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.v b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.v
index 07c1e13..141fbe9 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.v
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.v
@@ -58,7 +58,7 @@
     input  SCE    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfrbp cell (
+    sky130_fd_sc_hs__sdfrbp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -104,7 +104,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfrbp cell (
+    sky130_fd_sc_hs__sdfrbp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.v b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.v
index 3dca818..8de412c 100644
--- a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.v
+++ b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.v
@@ -56,7 +56,7 @@
     input  SCE    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfrtn cell (
+    sky130_fd_sc_hs__sdfrtn base (
         .RESET_B(RESET_B),
         .CLK_N(CLK_N),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfrtn cell (
+    sky130_fd_sc_hs__sdfrtn base (
         .RESET_B(RESET_B),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.v b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.v
index 75efaac..b5f3e00 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.v
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.v
@@ -56,7 +56,7 @@
     input  SCE    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfrtp cell (
+    sky130_fd_sc_hs__sdfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfrtp cell (
+    sky130_fd_sc_hs__sdfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.v b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.v
index 2538250..041ae5f 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.v
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.v
@@ -56,7 +56,7 @@
     input  SCE    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfrtp cell (
+    sky130_fd_sc_hs__sdfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfrtp cell (
+    sky130_fd_sc_hs__sdfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.v b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.v
index 667f7c8..e3af838 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.v
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.v
@@ -56,7 +56,7 @@
     input  SCE    ;
     input  VPWR   ;
     input  VGND   ;
-    sky130_fd_sc_hs__sdfrtp cell (
+    sky130_fd_sc_hs__sdfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfrtp cell (
+    sky130_fd_sc_hs__sdfrtp base (
         .RESET_B(RESET_B),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.v b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.v
index 3a70868..a8becac 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.v
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.v
@@ -58,7 +58,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__sdfsbp cell (
+    sky130_fd_sc_hs__sdfsbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -104,7 +104,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfsbp cell (
+    sky130_fd_sc_hs__sdfsbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.v b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.v
index 95fbf67..87a6d27 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.v
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.v
@@ -58,7 +58,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__sdfsbp cell (
+    sky130_fd_sc_hs__sdfsbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -104,7 +104,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfsbp cell (
+    sky130_fd_sc_hs__sdfsbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.v b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.v
index b17df4d..dd0e9ac 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.v
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.v
@@ -56,7 +56,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__sdfstp cell (
+    sky130_fd_sc_hs__sdfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfstp cell (
+    sky130_fd_sc_hs__sdfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.v b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.v
index a5bf33a..b65dea0 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.v
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.v
@@ -56,7 +56,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__sdfstp cell (
+    sky130_fd_sc_hs__sdfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfstp cell (
+    sky130_fd_sc_hs__sdfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.v b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.v
index 643f64c..bdbf605 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.v
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.v
@@ -56,7 +56,7 @@
     input  SET_B;
     input  VPWR ;
     input  VGND ;
-    sky130_fd_sc_hs__sdfstp cell (
+    sky130_fd_sc_hs__sdfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfstp cell (
+    sky130_fd_sc_hs__sdfstp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.v b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.v
index 27c6613..c1fe6d3 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.v
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.v
@@ -55,7 +55,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sdfxbp cell (
+    sky130_fd_sc_hs__sdfxbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -98,7 +98,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfxbp cell (
+    sky130_fd_sc_hs__sdfxbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.v b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.v
index d98bf12..518c7fa 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.v
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.v
@@ -55,7 +55,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sdfxbp cell (
+    sky130_fd_sc_hs__sdfxbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -98,7 +98,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfxbp cell (
+    sky130_fd_sc_hs__sdfxbp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.v b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.v
index 800dc63..edd36f2 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.v
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.v
@@ -53,7 +53,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sdfxtp cell (
+    sky130_fd_sc_hs__sdfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfxtp cell (
+    sky130_fd_sc_hs__sdfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.v b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.v
index 11693e1..8dd02a9 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.v
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.v
@@ -53,7 +53,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sdfxtp cell (
+    sky130_fd_sc_hs__sdfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfxtp cell (
+    sky130_fd_sc_hs__sdfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.v b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.v
index ea654d5..a106f36 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.v
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.v
@@ -53,7 +53,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sdfxtp cell (
+    sky130_fd_sc_hs__sdfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
@@ -93,7 +93,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdfxtp cell (
+    sky130_fd_sc_hs__sdfxtp base (
         .CLK(CLK),
         .D(D),
         .Q(Q),
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.v b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.v
index 1c5e1df..68c1bce 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.v
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.v
@@ -51,7 +51,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sdlclkp cell (
+    sky130_fd_sc_hs__sdlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdlclkp cell (
+    sky130_fd_sc_hs__sdlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.v b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.v
index 1706add..36814ea 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.v
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.v
@@ -51,7 +51,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sdlclkp cell (
+    sky130_fd_sc_hs__sdlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdlclkp cell (
+    sky130_fd_sc_hs__sdlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.v b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.v
index c921837..e31b494 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.v
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.v
@@ -51,7 +51,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sdlclkp cell (
+    sky130_fd_sc_hs__sdlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sdlclkp cell (
+    sky130_fd_sc_hs__sdlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.v b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.v
index 9d13443..6b793ea 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.v
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.v
@@ -58,7 +58,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sedfxbp cell (
+    sky130_fd_sc_hs__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -104,7 +104,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sedfxbp cell (
+    sky130_fd_sc_hs__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.v b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.v
index 19401ce..e8f40df 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.v
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.v
@@ -58,7 +58,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sedfxbp cell (
+    sky130_fd_sc_hs__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -104,7 +104,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sedfxbp cell (
+    sky130_fd_sc_hs__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.v b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.v
index c8bd6b4..6c75492 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.v
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.v
@@ -56,7 +56,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sedfxtp cell (
+    sky130_fd_sc_hs__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sedfxtp cell (
+    sky130_fd_sc_hs__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.v b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.v
index 0068311..316e604 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.v
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.v
@@ -56,7 +56,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sedfxtp cell (
+    sky130_fd_sc_hs__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sedfxtp cell (
+    sky130_fd_sc_hs__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.v b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.v
index 9c0f4c2..04f49a7 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.v
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.v
@@ -56,7 +56,7 @@
     input  SCE ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__sedfxtp cell (
+    sky130_fd_sc_hs__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -99,7 +99,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__sedfxtp cell (
+    sky130_fd_sc_hs__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/tap/sky130_fd_sc_hs__tap_1.v b/cells/tap/sky130_fd_sc_hs__tap_1.v
index c8f6018..78b5c89 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_1.v
+++ b/cells/tap/sky130_fd_sc_hs__tap_1.v
@@ -43,7 +43,7 @@
 
     input VPWR;
     input VGND;
-    sky130_fd_sc_hs__tap cell (
+    sky130_fd_sc_hs__tap base (
         .VPWR(VPWR),
         .VGND(VGND)
     );
@@ -68,7 +68,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__tap cell ();
+    sky130_fd_sc_hs__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tap/sky130_fd_sc_hs__tap_2.v b/cells/tap/sky130_fd_sc_hs__tap_2.v
index f45a230..a921ba5 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_2.v
+++ b/cells/tap/sky130_fd_sc_hs__tap_2.v
@@ -43,7 +43,7 @@
 
     input VPWR;
     input VGND;
-    sky130_fd_sc_hs__tap cell (
+    sky130_fd_sc_hs__tap base (
         .VPWR(VPWR),
         .VGND(VGND)
     );
@@ -68,7 +68,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__tap cell ();
+    sky130_fd_sc_hs__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.v b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.v
index c7c7cee..701d07a 100644
--- a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.v
+++ b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.v
@@ -43,7 +43,7 @@
 
     input VPWR;
     input VGND;
-    sky130_fd_sc_hs__tapmet1 cell (
+    sky130_fd_sc_hs__tapmet1 base (
         .VPWR(VPWR),
         .VGND(VGND)
     );
@@ -68,7 +68,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__tapmet1 cell ();
+    sky130_fd_sc_hs__tapmet1 base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.v b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.v
index 951dd1e..14c15e0 100644
--- a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.v
+++ b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.v
@@ -44,7 +44,7 @@
 
     input VPWR;
     input VGND;
-    sky130_fd_sc_hs__tapvgnd cell (
+    sky130_fd_sc_hs__tapvgnd base (
         .VPWR(VPWR),
         .VGND(VGND)
     );
@@ -69,7 +69,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__tapvgnd cell ();
+    sky130_fd_sc_hs__tapvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.v b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.v
index 4bddfa4..c6a83ad 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.v
+++ b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.v
@@ -44,7 +44,7 @@
 
     input VPWR;
     input VGND;
-    sky130_fd_sc_hs__tapvgnd2 cell (
+    sky130_fd_sc_hs__tapvgnd2 base (
         .VPWR(VPWR),
         .VGND(VGND)
     );
@@ -69,7 +69,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__tapvgnd2 cell ();
+    sky130_fd_sc_hs__tapvgnd2 base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.v b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.v
index a171e1f..cd74157 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.v
@@ -43,7 +43,7 @@
 
     input VPWR;
     input VGND;
-    sky130_fd_sc_hs__tapvpwrvgnd cell (
+    sky130_fd_sc_hs__tapvpwrvgnd base (
         .VPWR(VPWR),
         .VGND(VGND)
     );
@@ -68,7 +68,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__tapvpwrvgnd cell ();
+    sky130_fd_sc_hs__tapvpwrvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_1.v b/cells/xnor2/sky130_fd_sc_hs__xnor2_1.v
index 56e12d7..399ccb5 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_1.v
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_1.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xnor2 cell (
+    sky130_fd_sc_hs__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xnor2 cell (
+    sky130_fd_sc_hs__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_2.v b/cells/xnor2/sky130_fd_sc_hs__xnor2_2.v
index 16b1964..ceb6e88 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_2.v
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_2.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xnor2 cell (
+    sky130_fd_sc_hs__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xnor2 cell (
+    sky130_fd_sc_hs__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_4.v b/cells/xnor2/sky130_fd_sc_hs__xnor2_4.v
index 7961ce0..fe48d07 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_4.v
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_4.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xnor2 cell (
+    sky130_fd_sc_hs__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xnor2 cell (
+    sky130_fd_sc_hs__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_1.v b/cells/xnor3/sky130_fd_sc_hs__xnor3_1.v
index 9b70a31..723a7aa 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_1.v
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_1.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xnor3 cell (
+    sky130_fd_sc_hs__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xnor3 cell (
+    sky130_fd_sc_hs__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_2.v b/cells/xnor3/sky130_fd_sc_hs__xnor3_2.v
index 6ce7dd3..7c62856 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_2.v
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_2.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xnor3 cell (
+    sky130_fd_sc_hs__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xnor3 cell (
+    sky130_fd_sc_hs__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_4.v b/cells/xnor3/sky130_fd_sc_hs__xnor3_4.v
index 1e911e2..e62aa8d 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_4.v
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_4.v
@@ -51,7 +51,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xnor3 cell (
+    sky130_fd_sc_hs__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -88,7 +88,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xnor3 cell (
+    sky130_fd_sc_hs__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_1.v b/cells/xor2/sky130_fd_sc_hs__xor2_1.v
index 337472a..38bb512 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_1.v
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_1.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xor2 cell (
+    sky130_fd_sc_hs__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xor2 cell (
+    sky130_fd_sc_hs__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_2.v b/cells/xor2/sky130_fd_sc_hs__xor2_2.v
index fbd1c0e..28cff31 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_2.v
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_2.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xor2 cell (
+    sky130_fd_sc_hs__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xor2 cell (
+    sky130_fd_sc_hs__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_4.v b/cells/xor2/sky130_fd_sc_hs__xor2_4.v
index 46858c7..97b9d82 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_4.v
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_4.v
@@ -51,7 +51,7 @@
     input  B   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xor2 cell (
+    sky130_fd_sc_hs__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -85,7 +85,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xor2 cell (
+    sky130_fd_sc_hs__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_1.v b/cells/xor3/sky130_fd_sc_hs__xor3_1.v
index f705d31..164d141 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_1.v
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_1.v
@@ -53,7 +53,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xor3 cell (
+    sky130_fd_sc_hs__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xor3 cell (
+    sky130_fd_sc_hs__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_2.v b/cells/xor3/sky130_fd_sc_hs__xor3_2.v
index a8c997d..e68b943 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_2.v
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_2.v
@@ -53,7 +53,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xor3 cell (
+    sky130_fd_sc_hs__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xor3 cell (
+    sky130_fd_sc_hs__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_4.v b/cells/xor3/sky130_fd_sc_hs__xor3_4.v
index 5f7f6e0..afcfcff 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_4.v
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_4.v
@@ -53,7 +53,7 @@
     input  C   ;
     input  VPWR;
     input  VGND;
-    sky130_fd_sc_hs__xor3 cell (
+    sky130_fd_sc_hs__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -90,7 +90,7 @@
     supply1 VPWR;
     supply0 VGND;
 
-    sky130_fd_sc_hs__xor3 cell (
+    sky130_fd_sc_hs__xor3 base (
         .X(X),
         .A(A),
         .B(B),