diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.v b/cells/a211o/sky130_fd_sc_hdll__a211o_1.v
index e6d3821..00cc9b2 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.v
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a211o cell (
+    sky130_fd_sc_hdll__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a211o cell (
+    sky130_fd_sc_hdll__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.v b/cells/a211o/sky130_fd_sc_hdll__a211o_2.v
index ae0053a..7ce49ff 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.v
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a211o cell (
+    sky130_fd_sc_hdll__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a211o cell (
+    sky130_fd_sc_hdll__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.v b/cells/a211o/sky130_fd_sc_hdll__a211o_4.v
index 182231c..cf28ea9 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.v
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a211o cell (
+    sky130_fd_sc_hdll__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a211o cell (
+    sky130_fd_sc_hdll__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.v b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.v
index 2fe8357..ee92194 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.v
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a211oi cell (
+    sky130_fd_sc_hdll__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a211oi cell (
+    sky130_fd_sc_hdll__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.v b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.v
index a22745d..11e1652 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.v
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a211oi cell (
+    sky130_fd_sc_hdll__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a211oi cell (
+    sky130_fd_sc_hdll__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.v b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.v
index ede2026..8f9f4ab 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.v
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a211oi cell (
+    sky130_fd_sc_hdll__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a211oi cell (
+    sky130_fd_sc_hdll__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.v b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.v
index fb5ce69..ce3f22e 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.v
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21bo cell (
+    sky130_fd_sc_hdll__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21bo cell (
+    sky130_fd_sc_hdll__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.v b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.v
index b6704ed..9b3754a 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.v
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21bo cell (
+    sky130_fd_sc_hdll__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21bo cell (
+    sky130_fd_sc_hdll__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.v b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.v
index fead3f3..e8e13ce 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.v
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21bo cell (
+    sky130_fd_sc_hdll__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21bo cell (
+    sky130_fd_sc_hdll__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.v b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.v
index fd369a6..0716fdb 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.v
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21boi cell (
+    sky130_fd_sc_hdll__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21boi cell (
+    sky130_fd_sc_hdll__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.v b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.v
index a4bdb27..bb8e67a 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.v
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21boi cell (
+    sky130_fd_sc_hdll__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21boi cell (
+    sky130_fd_sc_hdll__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.v b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.v
index d4d60e0..137eb78 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.v
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21boi cell (
+    sky130_fd_sc_hdll__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21boi cell (
+    sky130_fd_sc_hdll__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.v b/cells/a21o/sky130_fd_sc_hdll__a21o_1.v
index f1bb665..fb48b5d 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.v b/cells/a21o/sky130_fd_sc_hdll__a21o_2.v
index deccbff..03fff8f 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.v b/cells/a21o/sky130_fd_sc_hdll__a21o_4.v
index 4544ec6..248abe0 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.v b/cells/a21o/sky130_fd_sc_hdll__a21o_6.v
index 42d9ae0..aeff63b 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.v b/cells/a21o/sky130_fd_sc_hdll__a21o_8.v
index 841a4ba..a78f276 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21o cell (
+    sky130_fd_sc_hdll__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.v b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.v
index 7aa5039..9c37f93 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.v
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21oi cell (
+    sky130_fd_sc_hdll__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21oi cell (
+    sky130_fd_sc_hdll__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.v b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.v
index 3295633..0b352ad 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.v
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21oi cell (
+    sky130_fd_sc_hdll__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21oi cell (
+    sky130_fd_sc_hdll__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.v b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.v
index c653bd7..11f89cc 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.v
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a21oi cell (
+    sky130_fd_sc_hdll__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a21oi cell (
+    sky130_fd_sc_hdll__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.v b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.v
index e55c4e7..b577243 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.v
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a221oi cell (
+    sky130_fd_sc_hdll__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a221oi cell (
+    sky130_fd_sc_hdll__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.v b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.v
index c9f176a..5eda31e 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.v
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a221oi cell (
+    sky130_fd_sc_hdll__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a221oi cell (
+    sky130_fd_sc_hdll__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.v b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.v
index d975b1e..2cc8059 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.v
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a221oi cell (
+    sky130_fd_sc_hdll__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a221oi cell (
+    sky130_fd_sc_hdll__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.v b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.v
index 99f01f0..618368d 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.v
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a222oi cell (
+    sky130_fd_sc_hdll__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a222oi cell (
+    sky130_fd_sc_hdll__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.v b/cells/a22o/sky130_fd_sc_hdll__a22o_1.v
index 61f54a7..e273e46 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.v
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a22o cell (
+    sky130_fd_sc_hdll__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a22o cell (
+    sky130_fd_sc_hdll__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.v b/cells/a22o/sky130_fd_sc_hdll__a22o_2.v
index 2d1af30..616e777 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.v
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a22o cell (
+    sky130_fd_sc_hdll__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a22o cell (
+    sky130_fd_sc_hdll__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.v b/cells/a22o/sky130_fd_sc_hdll__a22o_4.v
index edaacd9..f98e076 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.v
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a22o cell (
+    sky130_fd_sc_hdll__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a22o cell (
+    sky130_fd_sc_hdll__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.v b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.v
index 1109c9e..845aa5b 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.v
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a22oi cell (
+    sky130_fd_sc_hdll__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a22oi cell (
+    sky130_fd_sc_hdll__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.v b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.v
index f957140..e977319 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.v
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a22oi cell (
+    sky130_fd_sc_hdll__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a22oi cell (
+    sky130_fd_sc_hdll__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.v b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.v
index 2c5b3d1..b1c6c59 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.v
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a22oi cell (
+    sky130_fd_sc_hdll__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a22oi cell (
+    sky130_fd_sc_hdll__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.v b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.v
index 5545cd8..36683b1 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.v
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a2bb2o cell (
+    sky130_fd_sc_hdll__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a2bb2o cell (
+    sky130_fd_sc_hdll__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.v b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.v
index ec83ad3..20c3a66 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.v
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a2bb2o cell (
+    sky130_fd_sc_hdll__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a2bb2o cell (
+    sky130_fd_sc_hdll__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.v b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.v
index 64e6e69..566082a 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.v
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a2bb2o cell (
+    sky130_fd_sc_hdll__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a2bb2o cell (
+    sky130_fd_sc_hdll__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.v b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.v
index f31effb..8e6e061 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a2bb2oi cell (
+    sky130_fd_sc_hdll__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a2bb2oi cell (
+    sky130_fd_sc_hdll__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.v b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.v
index 89ab7dc..46a1671 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a2bb2oi cell (
+    sky130_fd_sc_hdll__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a2bb2oi cell (
+    sky130_fd_sc_hdll__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.v b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.v
index c573dac..9e7cc5d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a2bb2oi cell (
+    sky130_fd_sc_hdll__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a2bb2oi cell (
+    sky130_fd_sc_hdll__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.v b/cells/a31o/sky130_fd_sc_hdll__a31o_1.v
index e320e08..c506b61 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.v
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a31o cell (
+    sky130_fd_sc_hdll__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a31o cell (
+    sky130_fd_sc_hdll__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.v b/cells/a31o/sky130_fd_sc_hdll__a31o_2.v
index d70dc54..d7d3a81 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.v
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a31o cell (
+    sky130_fd_sc_hdll__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a31o cell (
+    sky130_fd_sc_hdll__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.v b/cells/a31o/sky130_fd_sc_hdll__a31o_4.v
index 6e97b2e..c7c2dd2 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.v
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a31o cell (
+    sky130_fd_sc_hdll__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a31o cell (
+    sky130_fd_sc_hdll__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.v b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.v
index 2fb5b90..ca3f01a 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.v
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a31oi cell (
+    sky130_fd_sc_hdll__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a31oi cell (
+    sky130_fd_sc_hdll__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.v b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.v
index ff4d4be..55a8205 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.v
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a31oi cell (
+    sky130_fd_sc_hdll__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a31oi cell (
+    sky130_fd_sc_hdll__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.v b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.v
index 588c5af..74e4943 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.v
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a31oi cell (
+    sky130_fd_sc_hdll__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a31oi cell (
+    sky130_fd_sc_hdll__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.v b/cells/a32o/sky130_fd_sc_hdll__a32o_1.v
index af92ca0..a72672e 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.v
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a32o cell (
+    sky130_fd_sc_hdll__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a32o cell (
+    sky130_fd_sc_hdll__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.v b/cells/a32o/sky130_fd_sc_hdll__a32o_2.v
index 70e10a7..bd37980 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.v
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a32o cell (
+    sky130_fd_sc_hdll__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a32o cell (
+    sky130_fd_sc_hdll__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.v b/cells/a32o/sky130_fd_sc_hdll__a32o_4.v
index 0330ecb..23776ca 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.v
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a32o cell (
+    sky130_fd_sc_hdll__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a32o cell (
+    sky130_fd_sc_hdll__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.v b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.v
index aab8ad4..75f41a5 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.v
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a32oi cell (
+    sky130_fd_sc_hdll__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a32oi cell (
+    sky130_fd_sc_hdll__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.v b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.v
index 32495f9..6c54161 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.v
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a32oi cell (
+    sky130_fd_sc_hdll__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a32oi cell (
+    sky130_fd_sc_hdll__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.v b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.v
index 7200add..020f66f 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.v
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__a32oi cell (
+    sky130_fd_sc_hdll__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__a32oi cell (
+    sky130_fd_sc_hdll__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.v b/cells/and2/sky130_fd_sc_hdll__and2_1.v
index 0a9cf66..8a69287 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.v b/cells/and2/sky130_fd_sc_hdll__and2_2.v
index 7790708..718121b 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.v b/cells/and2/sky130_fd_sc_hdll__and2_4.v
index 2d0d981..e421327 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.v b/cells/and2/sky130_fd_sc_hdll__and2_6.v
index 93095ce..5a94bf5 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.v b/cells/and2/sky130_fd_sc_hdll__and2_8.v
index b24edaa..053ad70 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and2 cell (
+    sky130_fd_sc_hdll__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.v b/cells/and2b/sky130_fd_sc_hdll__and2b_1.v
index 21bf053..5fe3585 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.v
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and2b cell (
+    sky130_fd_sc_hdll__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and2b cell (
+    sky130_fd_sc_hdll__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.v b/cells/and2b/sky130_fd_sc_hdll__and2b_2.v
index c722268..c7ca558 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.v
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and2b cell (
+    sky130_fd_sc_hdll__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and2b cell (
+    sky130_fd_sc_hdll__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.v b/cells/and2b/sky130_fd_sc_hdll__and2b_4.v
index a861927..a3e671e 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.v
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and2b cell (
+    sky130_fd_sc_hdll__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and2b cell (
+    sky130_fd_sc_hdll__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.v b/cells/and3/sky130_fd_sc_hdll__and3_1.v
index 6078d4a..da630b0 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.v
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and3 cell (
+    sky130_fd_sc_hdll__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and3 cell (
+    sky130_fd_sc_hdll__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.v b/cells/and3/sky130_fd_sc_hdll__and3_2.v
index fd28a04..703fc57 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.v
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and3 cell (
+    sky130_fd_sc_hdll__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and3 cell (
+    sky130_fd_sc_hdll__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.v b/cells/and3/sky130_fd_sc_hdll__and3_4.v
index b411dbe..fd11871 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.v
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and3 cell (
+    sky130_fd_sc_hdll__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and3 cell (
+    sky130_fd_sc_hdll__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.v b/cells/and3b/sky130_fd_sc_hdll__and3b_1.v
index f7282a1..e46648a 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.v
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and3b cell (
+    sky130_fd_sc_hdll__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and3b cell (
+    sky130_fd_sc_hdll__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.v b/cells/and3b/sky130_fd_sc_hdll__and3b_2.v
index 95463d4..5256f89 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.v
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and3b cell (
+    sky130_fd_sc_hdll__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and3b cell (
+    sky130_fd_sc_hdll__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.v b/cells/and3b/sky130_fd_sc_hdll__and3b_4.v
index 3d12363..4b7d915 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.v
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and3b cell (
+    sky130_fd_sc_hdll__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and3b cell (
+    sky130_fd_sc_hdll__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.v b/cells/and4/sky130_fd_sc_hdll__and4_1.v
index 16b1292..ba91da3 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.v
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4 cell (
+    sky130_fd_sc_hdll__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4 cell (
+    sky130_fd_sc_hdll__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.v b/cells/and4/sky130_fd_sc_hdll__and4_2.v
index adaf024..89d1524 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.v
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4 cell (
+    sky130_fd_sc_hdll__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4 cell (
+    sky130_fd_sc_hdll__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.v b/cells/and4/sky130_fd_sc_hdll__and4_4.v
index 585ae78..28d0a3a 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.v
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4 cell (
+    sky130_fd_sc_hdll__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4 cell (
+    sky130_fd_sc_hdll__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.v b/cells/and4b/sky130_fd_sc_hdll__and4b_1.v
index 662f59b..374e61a 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.v
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4b cell (
+    sky130_fd_sc_hdll__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4b cell (
+    sky130_fd_sc_hdll__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.v b/cells/and4b/sky130_fd_sc_hdll__and4b_2.v
index 82c5d9b..dd0605e 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.v
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4b cell (
+    sky130_fd_sc_hdll__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4b cell (
+    sky130_fd_sc_hdll__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.v b/cells/and4b/sky130_fd_sc_hdll__and4b_4.v
index 1fd8a5f..9ed45d8 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.v
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4b cell (
+    sky130_fd_sc_hdll__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4b cell (
+    sky130_fd_sc_hdll__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.v b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.v
index 313b15a..e47bbb7 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.v
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4bb cell (
+    sky130_fd_sc_hdll__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4bb cell (
+    sky130_fd_sc_hdll__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.v b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.v
index 61c6ac6..dc57a05 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.v
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4bb cell (
+    sky130_fd_sc_hdll__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4bb cell (
+    sky130_fd_sc_hdll__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.v b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.v
index 9fe7100..1c359b1 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.v
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__and4bb cell (
+    sky130_fd_sc_hdll__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__and4bb cell (
+    sky130_fd_sc_hdll__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.v b/cells/buf/sky130_fd_sc_hdll__buf_1.v
index 807b67d..1a3db55 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.v b/cells/buf/sky130_fd_sc_hdll__buf_12.v
index a81bf03..016e4ff 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.v b/cells/buf/sky130_fd_sc_hdll__buf_16.v
index 2fcb319..515bd9e 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.v b/cells/buf/sky130_fd_sc_hdll__buf_2.v
index 22fb290..f60b9e3 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.v b/cells/buf/sky130_fd_sc_hdll__buf_4.v
index e4c8aa5..4c472d7 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.v b/cells/buf/sky130_fd_sc_hdll__buf_6.v
index 5a81ff7..6b4f833 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.v b/cells/buf/sky130_fd_sc_hdll__buf_8.v
index 7575ea5..d38665f 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__buf cell (
+    sky130_fd_sc_hdll__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.v b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.v
index ffe9404..41e1667 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.v
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__bufbuf cell (
+    sky130_fd_sc_hdll__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__bufbuf cell (
+    sky130_fd_sc_hdll__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.v b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.v
index 90b8594..9ca2f16 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.v
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__bufbuf cell (
+    sky130_fd_sc_hdll__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__bufbuf cell (
+    sky130_fd_sc_hdll__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.v b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.v
index 82ccfac..3658092 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.v
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__bufinv cell (
+    sky130_fd_sc_hdll__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__bufinv cell (
+    sky130_fd_sc_hdll__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.v b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.v
index 8755556..e368e19 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.v
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__bufinv cell (
+    sky130_fd_sc_hdll__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__bufinv cell (
+    sky130_fd_sc_hdll__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.v
index 674e4cf..f78339b 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.v
index 9a2991e..375aec4 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.v
index ff7f833..3352bfb 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.v
index 46c1bbb..a80e84a 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.v
index 91c6a45..154ab46 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.v
index e5b1c56..49b732d 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.v
index bc280b3..999db5b 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkbuf cell (
+    sky130_fd_sc_hdll__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.v
index 40474ba..e897022 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.v
index fb0920b..22856c7 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.v
index 493f795..5777d2b 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.v
index c79781d..5237195 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.v
index caa0231..aaf9802 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.v
index dd66e12..db8c79e 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkinv cell (
+    sky130_fd_sc_hdll__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.v b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.v
index 47ee621..57ca147 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.v
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkinvlp cell (
+    sky130_fd_sc_hdll__clkinvlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkinvlp cell (
+    sky130_fd_sc_hdll__clkinvlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.v b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.v
index 184d91b..3106c57 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.v
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkinvlp cell (
+    sky130_fd_sc_hdll__clkinvlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkinvlp cell (
+    sky130_fd_sc_hdll__clkinvlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.v b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.v
index a98fd08..00f1b27 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.v
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkmux2 cell (
+    sky130_fd_sc_hdll__clkmux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkmux2 cell (
+    sky130_fd_sc_hdll__clkmux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.v b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.v
index fc7c9d5..1220f4b 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.v
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkmux2 cell (
+    sky130_fd_sc_hdll__clkmux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkmux2 cell (
+    sky130_fd_sc_hdll__clkmux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.v b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.v
index 72935db..830a23b 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.v
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__clkmux2 cell (
+    sky130_fd_sc_hdll__clkmux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__clkmux2 cell (
+    sky130_fd_sc_hdll__clkmux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.v b/cells/conb/sky130_fd_sc_hdll__conb_1.v
index ddf09ad..160dbfd 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.v
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__conb cell (
+    sky130_fd_sc_hdll__conb base (
         .HI(HI),
         .LO(LO),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__conb cell (
+    sky130_fd_sc_hdll__conb base (
         .HI(HI),
         .LO(LO)
     );
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.v b/cells/decap/sky130_fd_sc_hdll__decap_12.v
index f5b2b8b..3dfa660 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__decap cell (
+    sky130_fd_sc_hdll__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__decap cell ();
+    sky130_fd_sc_hdll__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.v b/cells/decap/sky130_fd_sc_hdll__decap_3.v
index e7687bf..549027c 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__decap cell (
+    sky130_fd_sc_hdll__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__decap cell ();
+    sky130_fd_sc_hdll__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.v b/cells/decap/sky130_fd_sc_hdll__decap_4.v
index ebe7232..a1d7dc7 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__decap cell (
+    sky130_fd_sc_hdll__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__decap cell ();
+    sky130_fd_sc_hdll__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.v b/cells/decap/sky130_fd_sc_hdll__decap_6.v
index 11fcf8e..7d63d36 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__decap cell (
+    sky130_fd_sc_hdll__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__decap cell ();
+    sky130_fd_sc_hdll__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.v b/cells/decap/sky130_fd_sc_hdll__decap_8.v
index 32f551e..f8fe0b7 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__decap cell (
+    sky130_fd_sc_hdll__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__decap cell ();
+    sky130_fd_sc_hdll__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.v b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.v
index 94dda0c..cad33b7 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.v
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dfrtp cell (
+    sky130_fd_sc_hdll__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dfrtp cell (
+    sky130_fd_sc_hdll__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.v b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.v
index 172aa09..fa23db7 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.v
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dfrtp cell (
+    sky130_fd_sc_hdll__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dfrtp cell (
+    sky130_fd_sc_hdll__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.v b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.v
index e387d8e..e563d96 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.v
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dfrtp cell (
+    sky130_fd_sc_hdll__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dfrtp cell (
+    sky130_fd_sc_hdll__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.v b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.v
index 2a6430f..c789767 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.v
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__dfstp cell (
+    sky130_fd_sc_hdll__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dfstp cell (
+    sky130_fd_sc_hdll__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.v b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.v
index dca0e1b..79b4ff6 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.v
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__dfstp cell (
+    sky130_fd_sc_hdll__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dfstp cell (
+    sky130_fd_sc_hdll__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.v b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.v
index 5a9d95d..f25e3ee 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.v
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__dfstp cell (
+    sky130_fd_sc_hdll__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dfstp cell (
+    sky130_fd_sc_hdll__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_2.v b/cells/diode/sky130_fd_sc_hdll__diode_2.v
index 1b65629..0b7298b 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_2.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode_2.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hdll__diode cell (
+    sky130_fd_sc_hdll__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__diode cell (
+    sky130_fd_sc_hdll__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_4.v b/cells/diode/sky130_fd_sc_hdll__diode_4.v
index 90285b7..d9df9e0 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_4.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode_4.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hdll__diode cell (
+    sky130_fd_sc_hdll__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__diode cell (
+    sky130_fd_sc_hdll__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_6.v b/cells/diode/sky130_fd_sc_hdll__diode_6.v
index 2905e5e..37aa616 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_6.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode_6.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hdll__diode cell (
+    sky130_fd_sc_hdll__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__diode cell (
+    sky130_fd_sc_hdll__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_8.v b/cells/diode/sky130_fd_sc_hdll__diode_8.v
index d152e34..2145a94 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_8.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode_8.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hdll__diode cell (
+    sky130_fd_sc_hdll__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__diode cell (
+    sky130_fd_sc_hdll__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.v b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.v
index 9d833ab..2163572 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.v
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dlrtn cell (
+    sky130_fd_sc_hdll__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlrtn cell (
+    sky130_fd_sc_hdll__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.v b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.v
index 4042f57..f349c5a 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.v
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dlrtn cell (
+    sky130_fd_sc_hdll__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlrtn cell (
+    sky130_fd_sc_hdll__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.v b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.v
index 6309431..f6e3463 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.v
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dlrtn cell (
+    sky130_fd_sc_hdll__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlrtn cell (
+    sky130_fd_sc_hdll__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.v b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.v
index 10ebe5e..860b7d8 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.v
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dlrtp cell (
+    sky130_fd_sc_hdll__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlrtp cell (
+    sky130_fd_sc_hdll__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.v b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.v
index 6541f73..7125d90 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.v
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dlrtp cell (
+    sky130_fd_sc_hdll__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlrtp cell (
+    sky130_fd_sc_hdll__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.v b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.v
index 3b4afad..a91043b 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.v
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__dlrtp cell (
+    sky130_fd_sc_hdll__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlrtp cell (
+    sky130_fd_sc_hdll__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.v b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.v
index e47a0cd..8f13e00 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.v
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hdll__dlxtn cell (
+    sky130_fd_sc_hdll__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlxtn cell (
+    sky130_fd_sc_hdll__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.v b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.v
index a67749a..80c00ef 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.v
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hdll__dlxtn cell (
+    sky130_fd_sc_hdll__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlxtn cell (
+    sky130_fd_sc_hdll__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.v b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.v
index cadfb0c..a649151 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.v
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hdll__dlxtn cell (
+    sky130_fd_sc_hdll__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlxtn cell (
+    sky130_fd_sc_hdll__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.v b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.v
index b6f3ac3..b70be0c 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__dlygate4sd1 cell (
+    sky130_fd_sc_hdll__dlygate4sd1 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlygate4sd1 cell (
+    sky130_fd_sc_hdll__dlygate4sd1 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.v b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.v
index ccb76d0..85d630d 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__dlygate4sd2 cell (
+    sky130_fd_sc_hdll__dlygate4sd2 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlygate4sd2 cell (
+    sky130_fd_sc_hdll__dlygate4sd2 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.v b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.v
index d9c444a..af923a0 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__dlygate4sd3 cell (
+    sky130_fd_sc_hdll__dlygate4sd3 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__dlygate4sd3 cell (
+    sky130_fd_sc_hdll__dlygate4sd3 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.v
index ab8cde6..1e33c21 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__ebufn cell (
+    sky130_fd_sc_hdll__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__ebufn cell (
+    sky130_fd_sc_hdll__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.v
index 66a1209..c354824 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__ebufn cell (
+    sky130_fd_sc_hdll__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__ebufn cell (
+    sky130_fd_sc_hdll__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.v
index 6beeb8d..3b5955c 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__ebufn cell (
+    sky130_fd_sc_hdll__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__ebufn cell (
+    sky130_fd_sc_hdll__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.v
index a1c9119..a2e56ae 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__ebufn cell (
+    sky130_fd_sc_hdll__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__ebufn cell (
+    sky130_fd_sc_hdll__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.v b/cells/einvn/sky130_fd_sc_hdll__einvn_1.v
index d4ce2a1..4533d6c 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__einvn cell (
+    sky130_fd_sc_hdll__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__einvn cell (
+    sky130_fd_sc_hdll__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.v b/cells/einvn/sky130_fd_sc_hdll__einvn_2.v
index 6e72e6d..42b9e09 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__einvn cell (
+    sky130_fd_sc_hdll__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__einvn cell (
+    sky130_fd_sc_hdll__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.v b/cells/einvn/sky130_fd_sc_hdll__einvn_4.v
index 8e9ea55..8313649 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__einvn cell (
+    sky130_fd_sc_hdll__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__einvn cell (
+    sky130_fd_sc_hdll__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.v b/cells/einvn/sky130_fd_sc_hdll__einvn_8.v
index afe9708..790a28a 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__einvn cell (
+    sky130_fd_sc_hdll__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__einvn cell (
+    sky130_fd_sc_hdll__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.v b/cells/einvp/sky130_fd_sc_hdll__einvp_1.v
index 58c13b6..c2555ff 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__einvp cell (
+    sky130_fd_sc_hdll__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__einvp cell (
+    sky130_fd_sc_hdll__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.v b/cells/einvp/sky130_fd_sc_hdll__einvp_2.v
index 3d6c6b0..c707a7d 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__einvp cell (
+    sky130_fd_sc_hdll__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__einvp cell (
+    sky130_fd_sc_hdll__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.v b/cells/einvp/sky130_fd_sc_hdll__einvp_4.v
index 1aa8897..b82e7aa 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__einvp cell (
+    sky130_fd_sc_hdll__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__einvp cell (
+    sky130_fd_sc_hdll__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.v b/cells/einvp/sky130_fd_sc_hdll__einvp_8.v
index 721f2c4..3afde24 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__einvp cell (
+    sky130_fd_sc_hdll__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__einvp cell (
+    sky130_fd_sc_hdll__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_1.v b/cells/fill/sky130_fd_sc_hdll__fill_1.v
index ed54205..8bbeed3 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__fill cell (
+    sky130_fd_sc_hdll__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__fill cell ();
+    sky130_fd_sc_hdll__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_2.v b/cells/fill/sky130_fd_sc_hdll__fill_2.v
index 6b6e602..7444cee 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__fill cell (
+    sky130_fd_sc_hdll__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__fill cell ();
+    sky130_fd_sc_hdll__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_4.v b/cells/fill/sky130_fd_sc_hdll__fill_4.v
index 8f004c7..7806822 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__fill cell (
+    sky130_fd_sc_hdll__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__fill cell ();
+    sky130_fd_sc_hdll__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_8.v b/cells/fill/sky130_fd_sc_hdll__fill_8.v
index d8ab84c..160c025 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__fill cell (
+    sky130_fd_sc_hdll__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__fill cell ();
+    sky130_fd_sc_hdll__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.v b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.v
index 9d49de1..db63838 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.v
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__inputiso0n cell (
+    sky130_fd_sc_hdll__inputiso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inputiso0n cell (
+    sky130_fd_sc_hdll__inputiso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.v b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.v
index 481dafc..b01b160 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.v
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__inputiso0p cell (
+    sky130_fd_sc_hdll__inputiso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inputiso0p cell (
+    sky130_fd_sc_hdll__inputiso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.v b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.v
index dcf1099..02d2c88 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.v
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__inputiso1n cell (
+    sky130_fd_sc_hdll__inputiso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inputiso1n cell (
+    sky130_fd_sc_hdll__inputiso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.v b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.v
index 053592c..9132c5a 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.v
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__inputiso1p cell (
+    sky130_fd_sc_hdll__inputiso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inputiso1p cell (
+    sky130_fd_sc_hdll__inputiso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.v b/cells/inv/sky130_fd_sc_hdll__inv_1.v
index 505e5e1..2990ff1 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.v b/cells/inv/sky130_fd_sc_hdll__inv_12.v
index 10acea0..740282b 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.v b/cells/inv/sky130_fd_sc_hdll__inv_16.v
index 8953c3a..5442b0b 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.v b/cells/inv/sky130_fd_sc_hdll__inv_2.v
index 1ffdeea..f721014 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.v b/cells/inv/sky130_fd_sc_hdll__inv_4.v
index 3dc47db..17b5957 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.v b/cells/inv/sky130_fd_sc_hdll__inv_6.v
index 0910531..5328b88 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.v b/cells/inv/sky130_fd_sc_hdll__inv_8.v
index 89e8f9b..e759c70 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__inv cell (
+    sky130_fd_sc_hdll__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.v
index 651e866..9bbf492 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.v
index 614bff3..9c36b3a 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.v
index 60551a1..470707a 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.v
index cec8f02..7290168 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.v
index a9e9554..3805609 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__isobufsrc cell (
+    sky130_fd_sc_hdll__isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.v b/cells/mux2/sky130_fd_sc_hdll__mux2_1.v
index e9b0f97..2ce12ac 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.v b/cells/mux2/sky130_fd_sc_hdll__mux2_12.v
index f2044ad..852e47d 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.v b/cells/mux2/sky130_fd_sc_hdll__mux2_16.v
index 27f46f1..27b13a6 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.v b/cells/mux2/sky130_fd_sc_hdll__mux2_2.v
index a07507c..f68e1e8 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.v b/cells/mux2/sky130_fd_sc_hdll__mux2_4.v
index 8574fd4..2c08a55 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.v b/cells/mux2/sky130_fd_sc_hdll__mux2_8.v
index 27f4309..69aaa1a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2 cell (
+    sky130_fd_sc_hdll__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.v b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.v
index 74e9e3c..b8daa7e 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.v
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2i cell (
+    sky130_fd_sc_hdll__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2i cell (
+    sky130_fd_sc_hdll__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.v b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.v
index 95bc5cf..608bb25 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.v
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2i cell (
+    sky130_fd_sc_hdll__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2i cell (
+    sky130_fd_sc_hdll__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.v b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.v
index 6abdc6e..3ba6292 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.v
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__mux2i cell (
+    sky130_fd_sc_hdll__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__mux2i cell (
+    sky130_fd_sc_hdll__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.v b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.v
index 98eb7d4..1389587 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.v
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.v
@@ -53,7 +53,7 @@
     input         VGND;
     input         VPB ;
     input         VNB ;
-    sky130_fd_sc_hdll__muxb16to1 cell (
+    sky130_fd_sc_hdll__muxb16to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb16to1 cell (
+    sky130_fd_sc_hdll__muxb16to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.v b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.v
index aacee19..1f0e0dd 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.v
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.v
@@ -53,7 +53,7 @@
     input         VGND;
     input         VPB ;
     input         VNB ;
-    sky130_fd_sc_hdll__muxb16to1 cell (
+    sky130_fd_sc_hdll__muxb16to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb16to1 cell (
+    sky130_fd_sc_hdll__muxb16to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.v b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.v
index 74a5532..fe0ff17 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.v
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.v
@@ -53,7 +53,7 @@
     input         VGND;
     input         VPB ;
     input         VNB ;
-    sky130_fd_sc_hdll__muxb16to1 cell (
+    sky130_fd_sc_hdll__muxb16to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb16to1 cell (
+    sky130_fd_sc_hdll__muxb16to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.v b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.v
index 5cfad75..ce370b8 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.v
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.v
@@ -53,7 +53,7 @@
     input        VGND;
     input        VPB ;
     input        VNB ;
-    sky130_fd_sc_hdll__muxb4to1 cell (
+    sky130_fd_sc_hdll__muxb4to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb4to1 cell (
+    sky130_fd_sc_hdll__muxb4to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.v b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.v
index dd9026f..51a56ea 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.v
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.v
@@ -53,7 +53,7 @@
     input        VGND;
     input        VPB ;
     input        VNB ;
-    sky130_fd_sc_hdll__muxb4to1 cell (
+    sky130_fd_sc_hdll__muxb4to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb4to1 cell (
+    sky130_fd_sc_hdll__muxb4to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.v b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.v
index 512e7cd..b312d1e 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.v
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.v
@@ -53,7 +53,7 @@
     input        VGND;
     input        VPB ;
     input        VNB ;
-    sky130_fd_sc_hdll__muxb4to1 cell (
+    sky130_fd_sc_hdll__muxb4to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb4to1 cell (
+    sky130_fd_sc_hdll__muxb4to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.v b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.v
index 94aa9d8..47d036c 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.v
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.v
@@ -53,7 +53,7 @@
     input        VGND;
     input        VPB ;
     input        VNB ;
-    sky130_fd_sc_hdll__muxb8to1 cell (
+    sky130_fd_sc_hdll__muxb8to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb8to1 cell (
+    sky130_fd_sc_hdll__muxb8to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.v b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.v
index 8cd8655..5502363 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.v
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.v
@@ -53,7 +53,7 @@
     input        VGND;
     input        VPB ;
     input        VNB ;
-    sky130_fd_sc_hdll__muxb8to1 cell (
+    sky130_fd_sc_hdll__muxb8to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb8to1 cell (
+    sky130_fd_sc_hdll__muxb8to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.v b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.v
index e0d9d2e..9ecac57 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.v
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.v
@@ -53,7 +53,7 @@
     input        VGND;
     input        VPB ;
     input        VNB ;
-    sky130_fd_sc_hdll__muxb8to1 cell (
+    sky130_fd_sc_hdll__muxb8to1 base (
         .Z(Z),
         .D(D),
         .S(S),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__muxb8to1 cell (
+    sky130_fd_sc_hdll__muxb8to1 base (
         .Z(Z),
         .D(D),
         .S(S)
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.v b/cells/nand2/sky130_fd_sc_hdll__nand2_1.v
index fd6124b..0813919 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.v b/cells/nand2/sky130_fd_sc_hdll__nand2_12.v
index 2474562..00fabd8 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.v b/cells/nand2/sky130_fd_sc_hdll__nand2_16.v
index 2678e56..0f5fe99 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.v b/cells/nand2/sky130_fd_sc_hdll__nand2_2.v
index 3526536..f4b25c3 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.v b/cells/nand2/sky130_fd_sc_hdll__nand2_4.v
index efc5a49..52accad 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.v b/cells/nand2/sky130_fd_sc_hdll__nand2_6.v
index fb4fd06..c4f2d46 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.v b/cells/nand2/sky130_fd_sc_hdll__nand2_8.v
index 3db4014..17a6260 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2 cell (
+    sky130_fd_sc_hdll__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.v b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.v
index 55f1be0..c89ae93 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.v
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2b cell (
+    sky130_fd_sc_hdll__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2b cell (
+    sky130_fd_sc_hdll__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.v b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.v
index 9621af1..7f88cf6 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.v
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2b cell (
+    sky130_fd_sc_hdll__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2b cell (
+    sky130_fd_sc_hdll__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.v b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.v
index d47f070..3257cd3 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.v
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand2b cell (
+    sky130_fd_sc_hdll__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand2b cell (
+    sky130_fd_sc_hdll__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.v b/cells/nand3/sky130_fd_sc_hdll__nand3_1.v
index 7602592..ea1d61c 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.v
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand3 cell (
+    sky130_fd_sc_hdll__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand3 cell (
+    sky130_fd_sc_hdll__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.v b/cells/nand3/sky130_fd_sc_hdll__nand3_2.v
index 7d9a5f3..8795b15 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.v
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand3 cell (
+    sky130_fd_sc_hdll__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand3 cell (
+    sky130_fd_sc_hdll__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.v b/cells/nand3/sky130_fd_sc_hdll__nand3_4.v
index 759c3cc..9fb89a6 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.v
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand3 cell (
+    sky130_fd_sc_hdll__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand3 cell (
+    sky130_fd_sc_hdll__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.v b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.v
index e05a22e..09bf755 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.v
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand3b cell (
+    sky130_fd_sc_hdll__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand3b cell (
+    sky130_fd_sc_hdll__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.v b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.v
index 0eee7f0..d2d8834 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.v
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand3b cell (
+    sky130_fd_sc_hdll__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand3b cell (
+    sky130_fd_sc_hdll__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.v b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.v
index 73cb093..d130405 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.v
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand3b cell (
+    sky130_fd_sc_hdll__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand3b cell (
+    sky130_fd_sc_hdll__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.v b/cells/nand4/sky130_fd_sc_hdll__nand4_1.v
index c906295..d41c910 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.v
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4 cell (
+    sky130_fd_sc_hdll__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4 cell (
+    sky130_fd_sc_hdll__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.v b/cells/nand4/sky130_fd_sc_hdll__nand4_2.v
index 47909bd..510b92d 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.v
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4 cell (
+    sky130_fd_sc_hdll__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4 cell (
+    sky130_fd_sc_hdll__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.v b/cells/nand4/sky130_fd_sc_hdll__nand4_4.v
index 0aefefe..f9f8725 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.v
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4 cell (
+    sky130_fd_sc_hdll__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4 cell (
+    sky130_fd_sc_hdll__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.v b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.v
index c307672..5a1573d 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.v
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4b cell (
+    sky130_fd_sc_hdll__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4b cell (
+    sky130_fd_sc_hdll__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.v b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.v
index 1069e84..223da97 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.v
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4b cell (
+    sky130_fd_sc_hdll__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4b cell (
+    sky130_fd_sc_hdll__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.v b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.v
index bdd96b5..20310fc 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.v
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4b cell (
+    sky130_fd_sc_hdll__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4b cell (
+    sky130_fd_sc_hdll__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.v b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.v
index ab5da5a..6bf857a 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.v
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4bb cell (
+    sky130_fd_sc_hdll__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4bb cell (
+    sky130_fd_sc_hdll__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.v b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.v
index 4eb98ca..ec37cd2 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.v
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4bb cell (
+    sky130_fd_sc_hdll__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4bb cell (
+    sky130_fd_sc_hdll__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.v b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.v
index 09b00de..ce53eac 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.v
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nand4bb cell (
+    sky130_fd_sc_hdll__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nand4bb cell (
+    sky130_fd_sc_hdll__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.v b/cells/nor2/sky130_fd_sc_hdll__nor2_1.v
index ad73910..9ac0fdc 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor2 cell (
+    sky130_fd_sc_hdll__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor2 cell (
+    sky130_fd_sc_hdll__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.v b/cells/nor2/sky130_fd_sc_hdll__nor2_2.v
index 77e3184..0a20af2 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor2 cell (
+    sky130_fd_sc_hdll__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor2 cell (
+    sky130_fd_sc_hdll__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.v b/cells/nor2/sky130_fd_sc_hdll__nor2_4.v
index 07e6c5e..fdc6900 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor2 cell (
+    sky130_fd_sc_hdll__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor2 cell (
+    sky130_fd_sc_hdll__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.v b/cells/nor2/sky130_fd_sc_hdll__nor2_8.v
index d5057fe..6cfe636 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor2 cell (
+    sky130_fd_sc_hdll__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor2 cell (
+    sky130_fd_sc_hdll__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.v b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.v
index 3154690..aae5b06 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.v
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor2b cell (
+    sky130_fd_sc_hdll__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor2b cell (
+    sky130_fd_sc_hdll__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.v b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.v
index c1811ad..a27e648 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.v
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor2b cell (
+    sky130_fd_sc_hdll__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor2b cell (
+    sky130_fd_sc_hdll__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.v b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.v
index a6cac24..2fac587 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.v
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor2b cell (
+    sky130_fd_sc_hdll__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor2b cell (
+    sky130_fd_sc_hdll__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.v b/cells/nor3/sky130_fd_sc_hdll__nor3_1.v
index 4e3827b..4a6820f 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.v
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor3 cell (
+    sky130_fd_sc_hdll__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor3 cell (
+    sky130_fd_sc_hdll__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.v b/cells/nor3/sky130_fd_sc_hdll__nor3_2.v
index e6e1ccd..6555bfa 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.v
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor3 cell (
+    sky130_fd_sc_hdll__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor3 cell (
+    sky130_fd_sc_hdll__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.v b/cells/nor3/sky130_fd_sc_hdll__nor3_4.v
index 49977f6..ab0fd38 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.v
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor3 cell (
+    sky130_fd_sc_hdll__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor3 cell (
+    sky130_fd_sc_hdll__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.v b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.v
index 16546cf..b8872e6 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.v
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor3b cell (
+    sky130_fd_sc_hdll__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor3b cell (
+    sky130_fd_sc_hdll__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.v b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.v
index 1d910a5..7932a0c 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.v
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor3b cell (
+    sky130_fd_sc_hdll__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor3b cell (
+    sky130_fd_sc_hdll__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.v b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.v
index 35d8a3f..cc673b7 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.v
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor3b cell (
+    sky130_fd_sc_hdll__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor3b cell (
+    sky130_fd_sc_hdll__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.v b/cells/nor4/sky130_fd_sc_hdll__nor4_1.v
index b2dad33..d9340ce 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.v b/cells/nor4/sky130_fd_sc_hdll__nor4_2.v
index 9d8fad7..a358c58 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.v b/cells/nor4/sky130_fd_sc_hdll__nor4_4.v
index 9d74a10..4516b46 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.v b/cells/nor4/sky130_fd_sc_hdll__nor4_6.v
index ecba37c..5e206ed 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.v b/cells/nor4/sky130_fd_sc_hdll__nor4_8.v
index ac9b4ad..be1dd3c 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4 cell (
+    sky130_fd_sc_hdll__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.v b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.v
index 2da2764..34a8f2e 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.v
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4b cell (
+    sky130_fd_sc_hdll__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4b cell (
+    sky130_fd_sc_hdll__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.v b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.v
index b186bfb..34021e5 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.v
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4b cell (
+    sky130_fd_sc_hdll__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4b cell (
+    sky130_fd_sc_hdll__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.v b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.v
index e89fa2b..f0addfa 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.v
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4b cell (
+    sky130_fd_sc_hdll__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4b cell (
+    sky130_fd_sc_hdll__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.v b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.v
index c13f6e9..fb92d12 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.v
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4bb cell (
+    sky130_fd_sc_hdll__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4bb cell (
+    sky130_fd_sc_hdll__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.v b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.v
index 1d5187b..f23a636 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.v
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4bb cell (
+    sky130_fd_sc_hdll__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4bb cell (
+    sky130_fd_sc_hdll__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.v b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.v
index c88fce0..4206303 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.v
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__nor4bb cell (
+    sky130_fd_sc_hdll__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__nor4bb cell (
+    sky130_fd_sc_hdll__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.v b/cells/o211a/sky130_fd_sc_hdll__o211a_1.v
index 8f67767..60e06f7 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.v
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o211a cell (
+    sky130_fd_sc_hdll__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o211a cell (
+    sky130_fd_sc_hdll__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.v b/cells/o211a/sky130_fd_sc_hdll__o211a_2.v
index 4de8000..ee932ca 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.v
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o211a cell (
+    sky130_fd_sc_hdll__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o211a cell (
+    sky130_fd_sc_hdll__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.v b/cells/o211a/sky130_fd_sc_hdll__o211a_4.v
index a8cd437..d365544 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.v
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o211a cell (
+    sky130_fd_sc_hdll__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o211a cell (
+    sky130_fd_sc_hdll__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.v b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.v
index 517f356..2dba77e 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.v
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o211ai cell (
+    sky130_fd_sc_hdll__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o211ai cell (
+    sky130_fd_sc_hdll__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.v b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.v
index 25ae2d2..c806f5c 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.v
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o211ai cell (
+    sky130_fd_sc_hdll__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o211ai cell (
+    sky130_fd_sc_hdll__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.v b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.v
index 2efcc5e..d0f86d1 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.v
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o211ai cell (
+    sky130_fd_sc_hdll__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o211ai cell (
+    sky130_fd_sc_hdll__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.v b/cells/o21a/sky130_fd_sc_hdll__o21a_1.v
index 5561465..5bfbaf8 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.v
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21a cell (
+    sky130_fd_sc_hdll__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21a cell (
+    sky130_fd_sc_hdll__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.v b/cells/o21a/sky130_fd_sc_hdll__o21a_2.v
index 0cd577e..a659da7 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.v
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21a cell (
+    sky130_fd_sc_hdll__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21a cell (
+    sky130_fd_sc_hdll__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.v b/cells/o21a/sky130_fd_sc_hdll__o21a_4.v
index d1801fb..f7d33d8 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.v
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21a cell (
+    sky130_fd_sc_hdll__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21a cell (
+    sky130_fd_sc_hdll__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.v b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.v
index f7448d7..34c77cf 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.v
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21ai cell (
+    sky130_fd_sc_hdll__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21ai cell (
+    sky130_fd_sc_hdll__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.v b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.v
index 064239c..007ebf5 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.v
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21ai cell (
+    sky130_fd_sc_hdll__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21ai cell (
+    sky130_fd_sc_hdll__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.v b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.v
index 1730d8b..37349f1 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.v
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21ai cell (
+    sky130_fd_sc_hdll__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21ai cell (
+    sky130_fd_sc_hdll__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.v b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.v
index 207c0cb..aa09ba4 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.v
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21ba cell (
+    sky130_fd_sc_hdll__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21ba cell (
+    sky130_fd_sc_hdll__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.v b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.v
index 03aef82..04375fe 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.v
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21ba cell (
+    sky130_fd_sc_hdll__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21ba cell (
+    sky130_fd_sc_hdll__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.v b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.v
index 5787660..c31eda9 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.v
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21ba cell (
+    sky130_fd_sc_hdll__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21ba cell (
+    sky130_fd_sc_hdll__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.v b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.v
index 37eb53a..deacd54 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.v
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21bai cell (
+    sky130_fd_sc_hdll__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21bai cell (
+    sky130_fd_sc_hdll__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.v b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.v
index 606ab4f..fd69897 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.v
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21bai cell (
+    sky130_fd_sc_hdll__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21bai cell (
+    sky130_fd_sc_hdll__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.v b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.v
index ff71e65..57a8b4e 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.v
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o21bai cell (
+    sky130_fd_sc_hdll__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o21bai cell (
+    sky130_fd_sc_hdll__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.v b/cells/o221a/sky130_fd_sc_hdll__o221a_1.v
index de2fced..f254e31 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.v
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o221a cell (
+    sky130_fd_sc_hdll__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o221a cell (
+    sky130_fd_sc_hdll__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.v b/cells/o221a/sky130_fd_sc_hdll__o221a_2.v
index 5acb057..829b884 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.v
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o221a cell (
+    sky130_fd_sc_hdll__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o221a cell (
+    sky130_fd_sc_hdll__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.v b/cells/o221a/sky130_fd_sc_hdll__o221a_4.v
index 2ae593f..f3c1d04 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.v
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o221a cell (
+    sky130_fd_sc_hdll__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o221a cell (
+    sky130_fd_sc_hdll__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.v b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.v
index 5145e4c..47cfcf8 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.v
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o221ai cell (
+    sky130_fd_sc_hdll__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o221ai cell (
+    sky130_fd_sc_hdll__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.v b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.v
index d7d0e18..3c368e8 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.v
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o221ai cell (
+    sky130_fd_sc_hdll__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o221ai cell (
+    sky130_fd_sc_hdll__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.v b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.v
index b9d2f1d..27afd6e 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.v
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o221ai cell (
+    sky130_fd_sc_hdll__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o221ai cell (
+    sky130_fd_sc_hdll__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.v b/cells/o22a/sky130_fd_sc_hdll__o22a_1.v
index 6a244b8..959d788 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.v
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o22a cell (
+    sky130_fd_sc_hdll__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o22a cell (
+    sky130_fd_sc_hdll__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.v b/cells/o22a/sky130_fd_sc_hdll__o22a_2.v
index 7dfa1b6..42f3571 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.v
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o22a cell (
+    sky130_fd_sc_hdll__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o22a cell (
+    sky130_fd_sc_hdll__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.v b/cells/o22a/sky130_fd_sc_hdll__o22a_4.v
index 65d9152..d622221 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.v
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o22a cell (
+    sky130_fd_sc_hdll__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o22a cell (
+    sky130_fd_sc_hdll__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.v b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.v
index 327b99d..d2325f4 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.v
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o22ai cell (
+    sky130_fd_sc_hdll__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o22ai cell (
+    sky130_fd_sc_hdll__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.v b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.v
index 4a93c57..6a18553 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.v
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o22ai cell (
+    sky130_fd_sc_hdll__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o22ai cell (
+    sky130_fd_sc_hdll__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.v b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.v
index 7b682ab..3fab697 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.v
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o22ai cell (
+    sky130_fd_sc_hdll__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o22ai cell (
+    sky130_fd_sc_hdll__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.v b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.v
index be31e70..dfc6750 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.v
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o2bb2a cell (
+    sky130_fd_sc_hdll__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o2bb2a cell (
+    sky130_fd_sc_hdll__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.v b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.v
index 9b6b812..1b3341c 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.v
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o2bb2a cell (
+    sky130_fd_sc_hdll__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o2bb2a cell (
+    sky130_fd_sc_hdll__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.v b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.v
index 4590d23..457929c 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.v
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o2bb2a cell (
+    sky130_fd_sc_hdll__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o2bb2a cell (
+    sky130_fd_sc_hdll__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.v b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.v
index 28acdbf..812a9e9 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o2bb2ai cell (
+    sky130_fd_sc_hdll__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o2bb2ai cell (
+    sky130_fd_sc_hdll__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.v b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.v
index 76affb8..8b4d8e1 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o2bb2ai cell (
+    sky130_fd_sc_hdll__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o2bb2ai cell (
+    sky130_fd_sc_hdll__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.v b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.v
index 32447c1..690710a 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o2bb2ai cell (
+    sky130_fd_sc_hdll__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o2bb2ai cell (
+    sky130_fd_sc_hdll__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.v b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.v
index e6e72cc..1e69bf3 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.v
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o31ai cell (
+    sky130_fd_sc_hdll__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o31ai cell (
+    sky130_fd_sc_hdll__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.v b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.v
index a036762..44fecab 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.v
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o31ai cell (
+    sky130_fd_sc_hdll__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o31ai cell (
+    sky130_fd_sc_hdll__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.v b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.v
index eb4af59..51dc743 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.v
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o31ai cell (
+    sky130_fd_sc_hdll__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o31ai cell (
+    sky130_fd_sc_hdll__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.v b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.v
index f20d232..77733ba 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.v
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o32ai cell (
+    sky130_fd_sc_hdll__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o32ai cell (
+    sky130_fd_sc_hdll__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.v b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.v
index 2c80074..6dec6e6 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.v
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o32ai cell (
+    sky130_fd_sc_hdll__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o32ai cell (
+    sky130_fd_sc_hdll__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.v b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.v
index 9e9c94c..f1da455 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.v
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__o32ai cell (
+    sky130_fd_sc_hdll__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__o32ai cell (
+    sky130_fd_sc_hdll__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.v b/cells/or2/sky130_fd_sc_hdll__or2_1.v
index 759e1e1..525f6e4 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.v b/cells/or2/sky130_fd_sc_hdll__or2_2.v
index 193ccb2..d544e8d 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.v b/cells/or2/sky130_fd_sc_hdll__or2_4.v
index 96c5f01..25069a9 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.v b/cells/or2/sky130_fd_sc_hdll__or2_6.v
index fc4952d..1ad962e 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.v b/cells/or2/sky130_fd_sc_hdll__or2_8.v
index 625fe97..67069aa 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or2 cell (
+    sky130_fd_sc_hdll__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.v b/cells/or2b/sky130_fd_sc_hdll__or2b_1.v
index 2ce5ee8..06be038 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.v
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or2b cell (
+    sky130_fd_sc_hdll__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or2b cell (
+    sky130_fd_sc_hdll__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.v b/cells/or2b/sky130_fd_sc_hdll__or2b_2.v
index 897b98d..ee4499e 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.v
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or2b cell (
+    sky130_fd_sc_hdll__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or2b cell (
+    sky130_fd_sc_hdll__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.v b/cells/or2b/sky130_fd_sc_hdll__or2b_4.v
index 9755ac1..3065b93 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.v
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or2b cell (
+    sky130_fd_sc_hdll__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or2b cell (
+    sky130_fd_sc_hdll__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.v b/cells/or3/sky130_fd_sc_hdll__or3_1.v
index 2d6cb8f..b65c192 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.v
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or3 cell (
+    sky130_fd_sc_hdll__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or3 cell (
+    sky130_fd_sc_hdll__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.v b/cells/or3/sky130_fd_sc_hdll__or3_2.v
index a043912..e441bd0 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.v
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or3 cell (
+    sky130_fd_sc_hdll__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or3 cell (
+    sky130_fd_sc_hdll__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.v b/cells/or3/sky130_fd_sc_hdll__or3_4.v
index 2479f98..714a00c 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.v
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or3 cell (
+    sky130_fd_sc_hdll__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or3 cell (
+    sky130_fd_sc_hdll__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.v b/cells/or3b/sky130_fd_sc_hdll__or3b_1.v
index 1c19992..15a31b7 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.v
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or3b cell (
+    sky130_fd_sc_hdll__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or3b cell (
+    sky130_fd_sc_hdll__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.v b/cells/or3b/sky130_fd_sc_hdll__or3b_2.v
index a688947..420fc03 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.v
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or3b cell (
+    sky130_fd_sc_hdll__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or3b cell (
+    sky130_fd_sc_hdll__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.v b/cells/or3b/sky130_fd_sc_hdll__or3b_4.v
index 748e7c4..ef7a8f8 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.v
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or3b cell (
+    sky130_fd_sc_hdll__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or3b cell (
+    sky130_fd_sc_hdll__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.v b/cells/or4/sky130_fd_sc_hdll__or4_1.v
index 3913ccd..5ddea2e 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.v
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4 cell (
+    sky130_fd_sc_hdll__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4 cell (
+    sky130_fd_sc_hdll__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.v b/cells/or4/sky130_fd_sc_hdll__or4_2.v
index 42eb54f..df7340a 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.v
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4 cell (
+    sky130_fd_sc_hdll__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4 cell (
+    sky130_fd_sc_hdll__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.v b/cells/or4/sky130_fd_sc_hdll__or4_4.v
index 73cce35..71d7336 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.v
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4 cell (
+    sky130_fd_sc_hdll__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4 cell (
+    sky130_fd_sc_hdll__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.v b/cells/or4b/sky130_fd_sc_hdll__or4b_1.v
index 4070d32..92ca557 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.v
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4b cell (
+    sky130_fd_sc_hdll__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4b cell (
+    sky130_fd_sc_hdll__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.v b/cells/or4b/sky130_fd_sc_hdll__or4b_2.v
index eb57c22..049acc7 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.v
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4b cell (
+    sky130_fd_sc_hdll__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4b cell (
+    sky130_fd_sc_hdll__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.v b/cells/or4b/sky130_fd_sc_hdll__or4b_4.v
index 0b10a87..060bfc3 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.v
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4b cell (
+    sky130_fd_sc_hdll__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4b cell (
+    sky130_fd_sc_hdll__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.v b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.v
index 968777b..1fc4903 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.v
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4bb cell (
+    sky130_fd_sc_hdll__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4bb cell (
+    sky130_fd_sc_hdll__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.v b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.v
index 4149dab..67c53bd 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.v
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4bb cell (
+    sky130_fd_sc_hdll__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4bb cell (
+    sky130_fd_sc_hdll__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.v b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.v
index 23c9c90..64a47f3 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.v
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__or4bb cell (
+    sky130_fd_sc_hdll__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__or4bb cell (
+    sky130_fd_sc_hdll__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.v b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.v
index 4857d88..e9cf573 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.v
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__probe_p cell (
+    sky130_fd_sc_hdll__probe_p base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__probe_p cell (
+    sky130_fd_sc_hdll__probe_p base (
         .X(X),
         .A(A)
     );
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.v b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.v
index 3005610..d285b9c 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.v
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__probec_p cell (
+    sky130_fd_sc_hdll__probec_p base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__probec_p cell (
+    sky130_fd_sc_hdll__probec_p base (
         .X(X),
         .A(A)
     );
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.v b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.v
index aa9c692..74d0765 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.v
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__sdfbbp cell (
+    sky130_fd_sc_hdll__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfbbp cell (
+    sky130_fd_sc_hdll__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.v b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.v
index 46e5129..b8762a3 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.v
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__sdfrbp cell (
+    sky130_fd_sc_hdll__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfrbp cell (
+    sky130_fd_sc_hdll__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.v b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.v
index 3935ba3..abe35e9 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.v
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__sdfrbp cell (
+    sky130_fd_sc_hdll__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfrbp cell (
+    sky130_fd_sc_hdll__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.v b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.v
index 88965c9..4b7d863 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.v
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__sdfrtn cell (
+    sky130_fd_sc_hdll__sdfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfrtn cell (
+    sky130_fd_sc_hdll__sdfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.v b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.v
index ddd0531..16ad3c4 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.v
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__sdfrtp cell (
+    sky130_fd_sc_hdll__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfrtp cell (
+    sky130_fd_sc_hdll__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.v b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.v
index 77d2a06..9450d72 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.v
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__sdfrtp cell (
+    sky130_fd_sc_hdll__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfrtp cell (
+    sky130_fd_sc_hdll__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.v b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.v
index b8b67fe..bf4d3b6 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.v
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hdll__sdfrtp cell (
+    sky130_fd_sc_hdll__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfrtp cell (
+    sky130_fd_sc_hdll__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.v b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.v
index c6c606f..86891de 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.v
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__sdfsbp cell (
+    sky130_fd_sc_hdll__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfsbp cell (
+    sky130_fd_sc_hdll__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.v b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.v
index 5c01bc6..ab92581 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.v
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__sdfsbp cell (
+    sky130_fd_sc_hdll__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfsbp cell (
+    sky130_fd_sc_hdll__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.v b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.v
index a2e343e..62db623 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.v
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__sdfstp cell (
+    sky130_fd_sc_hdll__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfstp cell (
+    sky130_fd_sc_hdll__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.v b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.v
index d32ba43..9d0d7be 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.v
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__sdfstp cell (
+    sky130_fd_sc_hdll__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfstp cell (
+    sky130_fd_sc_hdll__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.v b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.v
index e19ff51..a0d40ba 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.v
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hdll__sdfstp cell (
+    sky130_fd_sc_hdll__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfstp cell (
+    sky130_fd_sc_hdll__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.v b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.v
index f7906a8..c7a6019 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.v
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sdfxbp cell (
+    sky130_fd_sc_hdll__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfxbp cell (
+    sky130_fd_sc_hdll__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.v b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.v
index 1167e55..42955fd 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.v
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sdfxbp cell (
+    sky130_fd_sc_hdll__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfxbp cell (
+    sky130_fd_sc_hdll__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.v b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.v
index 00e3243..bcdadf6 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.v
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sdfxtp cell (
+    sky130_fd_sc_hdll__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfxtp cell (
+    sky130_fd_sc_hdll__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.v b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.v
index 95957c5..5a385ba 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.v
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sdfxtp cell (
+    sky130_fd_sc_hdll__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfxtp cell (
+    sky130_fd_sc_hdll__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.v b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.v
index 642d184..2afab49 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.v
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sdfxtp cell (
+    sky130_fd_sc_hdll__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdfxtp cell (
+    sky130_fd_sc_hdll__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.v b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.v
index 509dc3a..394666d 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.v
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sdlclkp cell (
+    sky130_fd_sc_hdll__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdlclkp cell (
+    sky130_fd_sc_hdll__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.v b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.v
index 65e99d2..b595c5f 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.v
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sdlclkp cell (
+    sky130_fd_sc_hdll__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdlclkp cell (
+    sky130_fd_sc_hdll__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.v b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.v
index d5158e4..c6e6c5e 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.v
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sdlclkp cell (
+    sky130_fd_sc_hdll__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sdlclkp cell (
+    sky130_fd_sc_hdll__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.v b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.v
index 4b9b9e2..7f2746d 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.v
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sedfxbp cell (
+    sky130_fd_sc_hdll__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sedfxbp cell (
+    sky130_fd_sc_hdll__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.v b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.v
index e54cce5..02681d2 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.v
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__sedfxbp cell (
+    sky130_fd_sc_hdll__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__sedfxbp cell (
+    sky130_fd_sc_hdll__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.v b/cells/tap/sky130_fd_sc_hdll__tap_1.v
index bac5ec5..727320d 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.v
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__tap cell (
+    sky130_fd_sc_hdll__tap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__tap cell ();
+    sky130_fd_sc_hdll__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.v b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.v
index 1748d55..ddb98ff 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.v
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.v
@@ -48,7 +48,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__tapvgnd cell (
+    sky130_fd_sc_hdll__tapvgnd base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -81,7 +81,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__tapvgnd cell ();
+    sky130_fd_sc_hdll__tapvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.v b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.v
index d6eca40..5d66e6e 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.v
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.v
@@ -48,7 +48,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__tapvgnd2 cell (
+    sky130_fd_sc_hdll__tapvgnd2 base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -81,7 +81,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__tapvgnd2 cell ();
+    sky130_fd_sc_hdll__tapvgnd2 base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.v b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.v
index 0d72a78..bd92bb2 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hdll__tapvpwrvgnd cell (
+    sky130_fd_sc_hdll__tapvpwrvgnd base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__tapvpwrvgnd cell ();
+    sky130_fd_sc_hdll__tapvpwrvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.v b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.v
index 3f78331..c15c5dc 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.v
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xnor2 cell (
+    sky130_fd_sc_hdll__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xnor2 cell (
+    sky130_fd_sc_hdll__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.v b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.v
index 44b9227..c038d91 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.v
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xnor2 cell (
+    sky130_fd_sc_hdll__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xnor2 cell (
+    sky130_fd_sc_hdll__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.v b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.v
index 3675022..408719d 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.v
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xnor2 cell (
+    sky130_fd_sc_hdll__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xnor2 cell (
+    sky130_fd_sc_hdll__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.v b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.v
index 3950366..31d1853 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.v
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xnor3 cell (
+    sky130_fd_sc_hdll__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xnor3 cell (
+    sky130_fd_sc_hdll__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.v b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.v
index 1d46a37..495fe80 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.v
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xnor3 cell (
+    sky130_fd_sc_hdll__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xnor3 cell (
+    sky130_fd_sc_hdll__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.v b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.v
index 3d10834..bc2ba45 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.v
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xnor3 cell (
+    sky130_fd_sc_hdll__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xnor3 cell (
+    sky130_fd_sc_hdll__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.v b/cells/xor2/sky130_fd_sc_hdll__xor2_1.v
index 2148e73..8097e8e 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.v
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xor2 cell (
+    sky130_fd_sc_hdll__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xor2 cell (
+    sky130_fd_sc_hdll__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.v b/cells/xor2/sky130_fd_sc_hdll__xor2_2.v
index 371f897..5fec481 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.v
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xor2 cell (
+    sky130_fd_sc_hdll__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xor2 cell (
+    sky130_fd_sc_hdll__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.v b/cells/xor2/sky130_fd_sc_hdll__xor2_4.v
index e55a207..46e361e 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.v
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xor2 cell (
+    sky130_fd_sc_hdll__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xor2 cell (
+    sky130_fd_sc_hdll__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.v b/cells/xor3/sky130_fd_sc_hdll__xor3_1.v
index b85b694..a11896a 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.v
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xor3 cell (
+    sky130_fd_sc_hdll__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xor3 cell (
+    sky130_fd_sc_hdll__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.v b/cells/xor3/sky130_fd_sc_hdll__xor3_2.v
index 5adb2ed..536492e 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.v
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xor3 cell (
+    sky130_fd_sc_hdll__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xor3 cell (
+    sky130_fd_sc_hdll__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.v b/cells/xor3/sky130_fd_sc_hdll__xor3_4.v
index 71c2464..acfbe57 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.v
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hdll__xor3 cell (
+    sky130_fd_sc_hdll__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hdll__xor3 cell (
+    sky130_fd_sc_hdll__xor3 base (
         .X(X),
         .A(A),
         .B(B),