diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.v b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.v
index 91d4359..7096d78 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.v
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2111o cell (
+    sky130_fd_sc_hd__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2111o cell (
+    sky130_fd_sc_hd__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.v b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.v
index 32f8c35..bb28e56 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.v
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2111o cell (
+    sky130_fd_sc_hd__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2111o cell (
+    sky130_fd_sc_hd__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.v b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.v
index cabc2f6..2a59677 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.v
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2111o cell (
+    sky130_fd_sc_hd__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2111o cell (
+    sky130_fd_sc_hd__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.v b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.v
index 4e46734..bde752d 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.v
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2111oi cell (
+    sky130_fd_sc_hd__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2111oi cell (
+    sky130_fd_sc_hd__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.v b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.v
index 7f53f0c..51fcf12 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.v
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2111oi cell (
+    sky130_fd_sc_hd__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2111oi cell (
+    sky130_fd_sc_hd__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.v b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.v
index 15d77c5..0890f7f 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.v
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2111oi cell (
+    sky130_fd_sc_hd__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2111oi cell (
+    sky130_fd_sc_hd__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.v b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.v
index 483f63c..957bd40 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.v
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2111oi cell (
+    sky130_fd_sc_hd__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2111oi cell (
+    sky130_fd_sc_hd__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_1.v b/cells/a211o/sky130_fd_sc_hd__a211o_1.v
index b63f71b..89269be 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_1.v
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a211o cell (
+    sky130_fd_sc_hd__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a211o cell (
+    sky130_fd_sc_hd__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_2.v b/cells/a211o/sky130_fd_sc_hd__a211o_2.v
index 1d13387..efd819f 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_2.v
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a211o cell (
+    sky130_fd_sc_hd__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a211o cell (
+    sky130_fd_sc_hd__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_4.v b/cells/a211o/sky130_fd_sc_hd__a211o_4.v
index 3e1f623..6c71913 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_4.v
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a211o cell (
+    sky130_fd_sc_hd__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a211o cell (
+    sky130_fd_sc_hd__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.v b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.v
index 97a0000..94d89c4 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.v
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a211oi cell (
+    sky130_fd_sc_hd__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a211oi cell (
+    sky130_fd_sc_hd__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.v b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.v
index a857eb5..0cbe0e7 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.v
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a211oi cell (
+    sky130_fd_sc_hd__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a211oi cell (
+    sky130_fd_sc_hd__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.v b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.v
index 8914c4b..58f2aea 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.v
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a211oi cell (
+    sky130_fd_sc_hd__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a211oi cell (
+    sky130_fd_sc_hd__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.v b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.v
index f271ee0..54417c4 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.v
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21bo cell (
+    sky130_fd_sc_hd__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21bo cell (
+    sky130_fd_sc_hd__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.v b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.v
index 55d3294..83e3bc1 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.v
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21bo cell (
+    sky130_fd_sc_hd__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21bo cell (
+    sky130_fd_sc_hd__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.v b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.v
index 843625f..46aa903 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.v
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21bo cell (
+    sky130_fd_sc_hd__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21bo cell (
+    sky130_fd_sc_hd__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.v b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.v
index e7bc17f..795a3e8 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.v
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21boi cell (
+    sky130_fd_sc_hd__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21boi cell (
+    sky130_fd_sc_hd__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.v b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.v
index 128f1e7..117b3e0 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.v
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21boi cell (
+    sky130_fd_sc_hd__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21boi cell (
+    sky130_fd_sc_hd__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.v b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.v
index 24acf9d..68dca43 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.v
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21boi cell (
+    sky130_fd_sc_hd__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21boi cell (
+    sky130_fd_sc_hd__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.v b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.v
index 1449912..1835421 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.v
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21boi cell (
+    sky130_fd_sc_hd__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21boi cell (
+    sky130_fd_sc_hd__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_1.v b/cells/a21o/sky130_fd_sc_hd__a21o_1.v
index d0d1773..29fc35e 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_1.v
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21o cell (
+    sky130_fd_sc_hd__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21o cell (
+    sky130_fd_sc_hd__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_2.v b/cells/a21o/sky130_fd_sc_hd__a21o_2.v
index 181638d..f5e7e3c 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_2.v
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21o cell (
+    sky130_fd_sc_hd__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21o cell (
+    sky130_fd_sc_hd__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_4.v b/cells/a21o/sky130_fd_sc_hd__a21o_4.v
index b47c59d..f6f5877 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_4.v
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21o cell (
+    sky130_fd_sc_hd__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21o cell (
+    sky130_fd_sc_hd__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.v b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.v
index b4b8a98..ae044f8 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.v
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21oi cell (
+    sky130_fd_sc_hd__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21oi cell (
+    sky130_fd_sc_hd__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.v b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.v
index a0dc678..8efff30 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.v
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21oi cell (
+    sky130_fd_sc_hd__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21oi cell (
+    sky130_fd_sc_hd__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.v b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.v
index 248ceae..e65e63a 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.v
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a21oi cell (
+    sky130_fd_sc_hd__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a21oi cell (
+    sky130_fd_sc_hd__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_1.v b/cells/a221o/sky130_fd_sc_hd__a221o_1.v
index f7662fc..590357b 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_1.v
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a221o cell (
+    sky130_fd_sc_hd__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a221o cell (
+    sky130_fd_sc_hd__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_2.v b/cells/a221o/sky130_fd_sc_hd__a221o_2.v
index 96e83c0..bdb5eb7 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_2.v
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a221o cell (
+    sky130_fd_sc_hd__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a221o cell (
+    sky130_fd_sc_hd__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_4.v b/cells/a221o/sky130_fd_sc_hd__a221o_4.v
index a0305bb..838f51f 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_4.v
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a221o cell (
+    sky130_fd_sc_hd__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a221o cell (
+    sky130_fd_sc_hd__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.v b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.v
index 8834c49..1b80851 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.v
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a221oi cell (
+    sky130_fd_sc_hd__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a221oi cell (
+    sky130_fd_sc_hd__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.v b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.v
index 0d13eee..4209b2b 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.v
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a221oi cell (
+    sky130_fd_sc_hd__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a221oi cell (
+    sky130_fd_sc_hd__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.v b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.v
index c331f9e..1a04c28 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.v
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a221oi cell (
+    sky130_fd_sc_hd__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a221oi cell (
+    sky130_fd_sc_hd__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.v b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.v
index aefb5a5..1c6dcf4 100644
--- a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.v
+++ b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a222oi cell (
+    sky130_fd_sc_hd__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a222oi cell (
+    sky130_fd_sc_hd__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_1.v b/cells/a22o/sky130_fd_sc_hd__a22o_1.v
index 0b3bd1b..2fedce6 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_1.v
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a22o cell (
+    sky130_fd_sc_hd__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a22o cell (
+    sky130_fd_sc_hd__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_2.v b/cells/a22o/sky130_fd_sc_hd__a22o_2.v
index a53d791..6bf5bc7 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_2.v
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a22o cell (
+    sky130_fd_sc_hd__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a22o cell (
+    sky130_fd_sc_hd__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_4.v b/cells/a22o/sky130_fd_sc_hd__a22o_4.v
index 9f2ad2e..501b3e3 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_4.v
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a22o cell (
+    sky130_fd_sc_hd__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a22o cell (
+    sky130_fd_sc_hd__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.v b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.v
index 5e0274b..2a84aa5 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.v
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a22oi cell (
+    sky130_fd_sc_hd__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a22oi cell (
+    sky130_fd_sc_hd__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.v b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.v
index 6345c32..24233d1 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.v
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a22oi cell (
+    sky130_fd_sc_hd__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a22oi cell (
+    sky130_fd_sc_hd__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.v b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.v
index 9dc38be..ff6ac1b 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.v
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a22oi cell (
+    sky130_fd_sc_hd__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a22oi cell (
+    sky130_fd_sc_hd__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.v b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.v
index 7e99f6b..ce1a05c 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.v
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2bb2o cell (
+    sky130_fd_sc_hd__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2bb2o cell (
+    sky130_fd_sc_hd__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.v b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.v
index 799e56e..8c33cc6 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.v
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2bb2o cell (
+    sky130_fd_sc_hd__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2bb2o cell (
+    sky130_fd_sc_hd__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.v b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.v
index a7a66d3..ab11c32 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.v
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2bb2o cell (
+    sky130_fd_sc_hd__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2bb2o cell (
+    sky130_fd_sc_hd__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.v b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.v
index eda90d5..7ee9d43 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2bb2oi cell (
+    sky130_fd_sc_hd__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2bb2oi cell (
+    sky130_fd_sc_hd__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.v b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.v
index e6381e6..ac9fb4c 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2bb2oi cell (
+    sky130_fd_sc_hd__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2bb2oi cell (
+    sky130_fd_sc_hd__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.v b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.v
index 41cd615..d7c55df 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a2bb2oi cell (
+    sky130_fd_sc_hd__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a2bb2oi cell (
+    sky130_fd_sc_hd__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_1.v b/cells/a311o/sky130_fd_sc_hd__a311o_1.v
index d685718..ab23e9b 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_1.v
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a311o cell (
+    sky130_fd_sc_hd__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a311o cell (
+    sky130_fd_sc_hd__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_2.v b/cells/a311o/sky130_fd_sc_hd__a311o_2.v
index 9efe46e..029e40e 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_2.v
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a311o cell (
+    sky130_fd_sc_hd__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a311o cell (
+    sky130_fd_sc_hd__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_4.v b/cells/a311o/sky130_fd_sc_hd__a311o_4.v
index d032d83..b7b2502 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_4.v
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a311o cell (
+    sky130_fd_sc_hd__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a311o cell (
+    sky130_fd_sc_hd__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.v b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.v
index dade81b..f6b16e1 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.v
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a311oi cell (
+    sky130_fd_sc_hd__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a311oi cell (
+    sky130_fd_sc_hd__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.v b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.v
index b79525c..fdda417 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.v
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a311oi cell (
+    sky130_fd_sc_hd__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a311oi cell (
+    sky130_fd_sc_hd__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.v b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.v
index 53322fa..874393c 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.v
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a311oi cell (
+    sky130_fd_sc_hd__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a311oi cell (
+    sky130_fd_sc_hd__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_1.v b/cells/a31o/sky130_fd_sc_hd__a31o_1.v
index 686b973..7e5a7be 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_1.v
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a31o cell (
+    sky130_fd_sc_hd__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a31o cell (
+    sky130_fd_sc_hd__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_2.v b/cells/a31o/sky130_fd_sc_hd__a31o_2.v
index 504853d..125a916 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_2.v
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a31o cell (
+    sky130_fd_sc_hd__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a31o cell (
+    sky130_fd_sc_hd__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_4.v b/cells/a31o/sky130_fd_sc_hd__a31o_4.v
index ce9f13d..b3aaa70 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_4.v
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a31o cell (
+    sky130_fd_sc_hd__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a31o cell (
+    sky130_fd_sc_hd__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.v b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.v
index add1bcd..3348999 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.v
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a31oi cell (
+    sky130_fd_sc_hd__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a31oi cell (
+    sky130_fd_sc_hd__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.v b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.v
index a2a9f7d..700ac54 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.v
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a31oi cell (
+    sky130_fd_sc_hd__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a31oi cell (
+    sky130_fd_sc_hd__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.v b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.v
index 3cda413..f9da08b 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.v
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a31oi cell (
+    sky130_fd_sc_hd__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a31oi cell (
+    sky130_fd_sc_hd__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_1.v b/cells/a32o/sky130_fd_sc_hd__a32o_1.v
index 8758703..6345e74 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_1.v
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a32o cell (
+    sky130_fd_sc_hd__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a32o cell (
+    sky130_fd_sc_hd__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_2.v b/cells/a32o/sky130_fd_sc_hd__a32o_2.v
index f31b2bd..d4a9a05 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_2.v
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a32o cell (
+    sky130_fd_sc_hd__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a32o cell (
+    sky130_fd_sc_hd__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_4.v b/cells/a32o/sky130_fd_sc_hd__a32o_4.v
index 7a0eb5a..f8d8fe1 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_4.v
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a32o cell (
+    sky130_fd_sc_hd__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a32o cell (
+    sky130_fd_sc_hd__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.v b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.v
index 2cce9bc..13ac5f5 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.v
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a32oi cell (
+    sky130_fd_sc_hd__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a32oi cell (
+    sky130_fd_sc_hd__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.v b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.v
index af3d216..0345887 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.v
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a32oi cell (
+    sky130_fd_sc_hd__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a32oi cell (
+    sky130_fd_sc_hd__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.v b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.v
index a903f7d..da1bb1f 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.v
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a32oi cell (
+    sky130_fd_sc_hd__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a32oi cell (
+    sky130_fd_sc_hd__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_1.v b/cells/a41o/sky130_fd_sc_hd__a41o_1.v
index 1df833d..ce5897b 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_1.v
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a41o cell (
+    sky130_fd_sc_hd__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a41o cell (
+    sky130_fd_sc_hd__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_2.v b/cells/a41o/sky130_fd_sc_hd__a41o_2.v
index cb53669..a8e2524 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_2.v
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a41o cell (
+    sky130_fd_sc_hd__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a41o cell (
+    sky130_fd_sc_hd__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_4.v b/cells/a41o/sky130_fd_sc_hd__a41o_4.v
index c1dbd4a..929ee83 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_4.v
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a41o cell (
+    sky130_fd_sc_hd__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a41o cell (
+    sky130_fd_sc_hd__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.v b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.v
index 5beb8e3..b0e59db 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.v
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a41oi cell (
+    sky130_fd_sc_hd__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a41oi cell (
+    sky130_fd_sc_hd__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.v b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.v
index 8b559a0..3408d08 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.v
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a41oi cell (
+    sky130_fd_sc_hd__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a41oi cell (
+    sky130_fd_sc_hd__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.v b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.v
index f2fc2a9..8f479f0 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.v
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__a41oi cell (
+    sky130_fd_sc_hd__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__a41oi cell (
+    sky130_fd_sc_hd__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/and2/sky130_fd_sc_hd__and2_0.v b/cells/and2/sky130_fd_sc_hd__and2_0.v
index 5aeb438..8ed8b91 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_0.v
+++ b/cells/and2/sky130_fd_sc_hd__and2_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and2 cell (
+    sky130_fd_sc_hd__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and2 cell (
+    sky130_fd_sc_hd__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hd__and2_1.v b/cells/and2/sky130_fd_sc_hd__and2_1.v
index d1f8275..c8fd920 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_1.v
+++ b/cells/and2/sky130_fd_sc_hd__and2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and2 cell (
+    sky130_fd_sc_hd__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and2 cell (
+    sky130_fd_sc_hd__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hd__and2_2.v b/cells/and2/sky130_fd_sc_hd__and2_2.v
index 4118eb2..a10a54e 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_2.v
+++ b/cells/and2/sky130_fd_sc_hd__and2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and2 cell (
+    sky130_fd_sc_hd__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and2 cell (
+    sky130_fd_sc_hd__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_hd__and2_4.v b/cells/and2/sky130_fd_sc_hd__and2_4.v
index 52c403b..3a5caac 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_4.v
+++ b/cells/and2/sky130_fd_sc_hd__and2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and2 cell (
+    sky130_fd_sc_hd__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and2 cell (
+    sky130_fd_sc_hd__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_1.v b/cells/and2b/sky130_fd_sc_hd__and2b_1.v
index 2490674..620ef74 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_1.v
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and2b cell (
+    sky130_fd_sc_hd__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and2b cell (
+    sky130_fd_sc_hd__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_2.v b/cells/and2b/sky130_fd_sc_hd__and2b_2.v
index 50c0586..0c94557 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_2.v
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and2b cell (
+    sky130_fd_sc_hd__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and2b cell (
+    sky130_fd_sc_hd__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_4.v b/cells/and2b/sky130_fd_sc_hd__and2b_4.v
index 7b53959..e6defc1 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_4.v
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and2b cell (
+    sky130_fd_sc_hd__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and2b cell (
+    sky130_fd_sc_hd__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and3/sky130_fd_sc_hd__and3_1.v b/cells/and3/sky130_fd_sc_hd__and3_1.v
index 2d26f71..f9eb480 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_1.v
+++ b/cells/and3/sky130_fd_sc_hd__and3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and3 cell (
+    sky130_fd_sc_hd__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and3 cell (
+    sky130_fd_sc_hd__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_hd__and3_2.v b/cells/and3/sky130_fd_sc_hd__and3_2.v
index e72a1e7..37f3259 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_2.v
+++ b/cells/and3/sky130_fd_sc_hd__and3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and3 cell (
+    sky130_fd_sc_hd__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and3 cell (
+    sky130_fd_sc_hd__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_hd__and3_4.v b/cells/and3/sky130_fd_sc_hd__and3_4.v
index 8578955..5093fef 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_4.v
+++ b/cells/and3/sky130_fd_sc_hd__and3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and3 cell (
+    sky130_fd_sc_hd__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and3 cell (
+    sky130_fd_sc_hd__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_1.v b/cells/and3b/sky130_fd_sc_hd__and3b_1.v
index cbb5461..fb6fc88 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_1.v
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and3b cell (
+    sky130_fd_sc_hd__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and3b cell (
+    sky130_fd_sc_hd__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_2.v b/cells/and3b/sky130_fd_sc_hd__and3b_2.v
index 21cb5de..7f7c7b0 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_2.v
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and3b cell (
+    sky130_fd_sc_hd__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and3b cell (
+    sky130_fd_sc_hd__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_4.v b/cells/and3b/sky130_fd_sc_hd__and3b_4.v
index 26f4099..14b591c 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_4.v
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and3b cell (
+    sky130_fd_sc_hd__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and3b cell (
+    sky130_fd_sc_hd__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hd__and4_1.v b/cells/and4/sky130_fd_sc_hd__and4_1.v
index 11fdb1d..7346f1d 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_1.v
+++ b/cells/and4/sky130_fd_sc_hd__and4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4 cell (
+    sky130_fd_sc_hd__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4 cell (
+    sky130_fd_sc_hd__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hd__and4_2.v b/cells/and4/sky130_fd_sc_hd__and4_2.v
index 0020c09..08927af 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_2.v
+++ b/cells/and4/sky130_fd_sc_hd__and4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4 cell (
+    sky130_fd_sc_hd__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4 cell (
+    sky130_fd_sc_hd__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_hd__and4_4.v b/cells/and4/sky130_fd_sc_hd__and4_4.v
index f362f8e..e38f606 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_4.v
+++ b/cells/and4/sky130_fd_sc_hd__and4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4 cell (
+    sky130_fd_sc_hd__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4 cell (
+    sky130_fd_sc_hd__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_1.v b/cells/and4b/sky130_fd_sc_hd__and4b_1.v
index 74b2809..ed744b8 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_1.v
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4b cell (
+    sky130_fd_sc_hd__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4b cell (
+    sky130_fd_sc_hd__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_2.v b/cells/and4b/sky130_fd_sc_hd__and4b_2.v
index 4d910f8..73a092c 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_2.v
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4b cell (
+    sky130_fd_sc_hd__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4b cell (
+    sky130_fd_sc_hd__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_4.v b/cells/and4b/sky130_fd_sc_hd__and4b_4.v
index c5fe41d..a43f48f 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_4.v
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4b cell (
+    sky130_fd_sc_hd__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4b cell (
+    sky130_fd_sc_hd__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.v b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.v
index a47e0ff..780ee72 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.v
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4bb cell (
+    sky130_fd_sc_hd__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4bb cell (
+    sky130_fd_sc_hd__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.v b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.v
index d07a907..1a0d3fd 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.v
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4bb cell (
+    sky130_fd_sc_hd__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4bb cell (
+    sky130_fd_sc_hd__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.v b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.v
index e20c7c6..8482f43 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.v
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__and4bb cell (
+    sky130_fd_sc_hd__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__and4bb cell (
+    sky130_fd_sc_hd__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/buf/sky130_fd_sc_hd__buf_1.v b/cells/buf/sky130_fd_sc_hd__buf_1.v
index eb43742..239defd 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_1.v
+++ b/cells/buf/sky130_fd_sc_hd__buf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hd__buf_12.v b/cells/buf/sky130_fd_sc_hd__buf_12.v
index 9b73b0f..83975e9 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_12.v
+++ b/cells/buf/sky130_fd_sc_hd__buf_12.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hd__buf_16.v b/cells/buf/sky130_fd_sc_hd__buf_16.v
index 33aeeda..5264607 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_16.v
+++ b/cells/buf/sky130_fd_sc_hd__buf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hd__buf_2.v b/cells/buf/sky130_fd_sc_hd__buf_2.v
index 00fd85f..5e88c12 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_2.v
+++ b/cells/buf/sky130_fd_sc_hd__buf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hd__buf_4.v b/cells/buf/sky130_fd_sc_hd__buf_4.v
index 1cb8a94..214b1a8 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_4.v
+++ b/cells/buf/sky130_fd_sc_hd__buf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hd__buf_6.v b/cells/buf/sky130_fd_sc_hd__buf_6.v
index 4d63294..054904f 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_6.v
+++ b/cells/buf/sky130_fd_sc_hd__buf_6.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hd__buf_8.v b/cells/buf/sky130_fd_sc_hd__buf_8.v
index 02ce353..41064d2 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_8.v
+++ b/cells/buf/sky130_fd_sc_hd__buf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__buf cell (
+    sky130_fd_sc_hd__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.v b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.v
index 116465a..d8e5be2 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.v
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__bufbuf cell (
+    sky130_fd_sc_hd__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__bufbuf cell (
+    sky130_fd_sc_hd__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.v b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.v
index cf356ff..e69724e 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.v
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__bufbuf cell (
+    sky130_fd_sc_hd__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__bufbuf cell (
+    sky130_fd_sc_hd__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.v b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.v
index a19f49f..46f2bba 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.v
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__bufinv cell (
+    sky130_fd_sc_hd__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__bufinv cell (
+    sky130_fd_sc_hd__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.v b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.v
index 41e1b28..4a2c65d 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.v
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__bufinv cell (
+    sky130_fd_sc_hd__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__bufinv cell (
+    sky130_fd_sc_hd__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.v b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.v
index 54c3725..124081d 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.v
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.v b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.v
index 909731d..dcc4f13 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.v
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.v b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.v
index c5e5b48..4ffd83a 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.v
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.v b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.v
index dd8dc3a..78f1da8 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.v
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.v b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.v
index 3a5b998..bba4efc 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.v
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkbuf cell (
+    sky130_fd_sc_hd__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.v b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.v
index 0bdfba8..16caf32 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.v
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkdlybuf4s15 cell (
+    sky130_fd_sc_hd__clkdlybuf4s15 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkdlybuf4s15 cell (
+    sky130_fd_sc_hd__clkdlybuf4s15 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.v b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.v
index 09a6440..41a828b 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.v
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkdlybuf4s15 cell (
+    sky130_fd_sc_hd__clkdlybuf4s15 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkdlybuf4s15 cell (
+    sky130_fd_sc_hd__clkdlybuf4s15 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.v b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.v
index b2c75c5..334a348 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.v
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkdlybuf4s18 cell (
+    sky130_fd_sc_hd__clkdlybuf4s18 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkdlybuf4s18 cell (
+    sky130_fd_sc_hd__clkdlybuf4s18 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.v b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.v
index 452d07e..17f91c4 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.v
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkdlybuf4s18 cell (
+    sky130_fd_sc_hd__clkdlybuf4s18 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkdlybuf4s18 cell (
+    sky130_fd_sc_hd__clkdlybuf4s18 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.v b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.v
index e677867..b73c600 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.v
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkdlybuf4s25 cell (
+    sky130_fd_sc_hd__clkdlybuf4s25 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkdlybuf4s25 cell (
+    sky130_fd_sc_hd__clkdlybuf4s25 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.v b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.v
index ed4bdb7..1e23c46 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.v
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkdlybuf4s25 cell (
+    sky130_fd_sc_hd__clkdlybuf4s25 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkdlybuf4s25 cell (
+    sky130_fd_sc_hd__clkdlybuf4s25 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.v b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.v
index 09c37ec..04519d2 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.v
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkdlybuf4s50 cell (
+    sky130_fd_sc_hd__clkdlybuf4s50 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkdlybuf4s50 cell (
+    sky130_fd_sc_hd__clkdlybuf4s50 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.v b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.v
index ab27b8c..c3d516c 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.v
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkdlybuf4s50 cell (
+    sky130_fd_sc_hd__clkdlybuf4s50 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkdlybuf4s50 cell (
+    sky130_fd_sc_hd__clkdlybuf4s50 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.v b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.v
index f391fbe..393f7bf 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.v
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.v b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.v
index 633bf07..ae3e856 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.v
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.v b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.v
index dbdd7a6..5bc2920 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.v
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.v b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.v
index 21f611e..83fe8a1 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.v
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.v b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.v
index 9d8d3ff..a898c5f 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.v
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkinv cell (
+    sky130_fd_sc_hd__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.v b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.v
index 8c69691..9ab1abe 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.v
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkinvlp cell (
+    sky130_fd_sc_hd__clkinvlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkinvlp cell (
+    sky130_fd_sc_hd__clkinvlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.v b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.v
index 3ab4199..6de32d9 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.v
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__clkinvlp cell (
+    sky130_fd_sc_hd__clkinvlp base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__clkinvlp cell (
+    sky130_fd_sc_hd__clkinvlp base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/conb/sky130_fd_sc_hd__conb_1.v b/cells/conb/sky130_fd_sc_hd__conb_1.v
index 9a7aebc..6693051 100644
--- a/cells/conb/sky130_fd_sc_hd__conb_1.v
+++ b/cells/conb/sky130_fd_sc_hd__conb_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__conb cell (
+    sky130_fd_sc_hd__conb base (
         .HI(HI),
         .LO(LO),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__conb cell (
+    sky130_fd_sc_hd__conb base (
         .HI(HI),
         .LO(LO)
     );
diff --git a/cells/decap/sky130_fd_sc_hd__decap_12.v b/cells/decap/sky130_fd_sc_hd__decap_12.v
index 3c645c2..98c6ba5 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_12.v
+++ b/cells/decap/sky130_fd_sc_hd__decap_12.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__decap cell (
+    sky130_fd_sc_hd__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__decap cell ();
+    sky130_fd_sc_hd__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hd__decap_3.v b/cells/decap/sky130_fd_sc_hd__decap_3.v
index 48ce636..c760ebe 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_3.v
+++ b/cells/decap/sky130_fd_sc_hd__decap_3.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__decap cell (
+    sky130_fd_sc_hd__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__decap cell ();
+    sky130_fd_sc_hd__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hd__decap_4.v b/cells/decap/sky130_fd_sc_hd__decap_4.v
index d0e9ecc..14560dd 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_4.v
+++ b/cells/decap/sky130_fd_sc_hd__decap_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__decap cell (
+    sky130_fd_sc_hd__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__decap cell ();
+    sky130_fd_sc_hd__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hd__decap_6.v b/cells/decap/sky130_fd_sc_hd__decap_6.v
index ba1bd7d..df227b6 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_6.v
+++ b/cells/decap/sky130_fd_sc_hd__decap_6.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__decap cell (
+    sky130_fd_sc_hd__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__decap cell ();
+    sky130_fd_sc_hd__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hd__decap_8.v b/cells/decap/sky130_fd_sc_hd__decap_8.v
index f0247e8..de8ac4c 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_8.v
+++ b/cells/decap/sky130_fd_sc_hd__decap_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__decap cell (
+    sky130_fd_sc_hd__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__decap cell ();
+    sky130_fd_sc_hd__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.v b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.v
index 302e5f0..539c12d 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.v
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfbbn cell (
+    sky130_fd_sc_hd__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfbbn cell (
+    sky130_fd_sc_hd__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.v b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.v
index 1ae52ff..de2bc06 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.v
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfbbn cell (
+    sky130_fd_sc_hd__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfbbn cell (
+    sky130_fd_sc_hd__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.v b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.v
index fbbbdf2..cc255f1 100644
--- a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.v
+++ b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfbbp cell (
+    sky130_fd_sc_hd__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfbbp cell (
+    sky130_fd_sc_hd__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.v b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.v
index 765f6c7..c6c0458 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.v
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfrbp cell (
+    sky130_fd_sc_hd__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfrbp cell (
+    sky130_fd_sc_hd__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.v b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.v
index 894104f..50ec5c4 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.v
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfrbp cell (
+    sky130_fd_sc_hd__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfrbp cell (
+    sky130_fd_sc_hd__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.v b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.v
index c7f793d..51de090 100644
--- a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.v
+++ b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfrtn cell (
+    sky130_fd_sc_hd__dfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfrtn cell (
+    sky130_fd_sc_hd__dfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.v b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.v
index 79a8a11..86968ee 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.v
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfrtp cell (
+    sky130_fd_sc_hd__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfrtp cell (
+    sky130_fd_sc_hd__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.v b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.v
index 2c7a0fc..723fbf0 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.v
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfrtp cell (
+    sky130_fd_sc_hd__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfrtp cell (
+    sky130_fd_sc_hd__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.v b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.v
index e3f9cad..562d624 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.v
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dfrtp cell (
+    sky130_fd_sc_hd__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfrtp cell (
+    sky130_fd_sc_hd__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.v b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.v
index 6128216..9a74bea 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.v
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__dfsbp cell (
+    sky130_fd_sc_hd__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfsbp cell (
+    sky130_fd_sc_hd__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.v b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.v
index 5b0defc..5322d83 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.v
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__dfsbp cell (
+    sky130_fd_sc_hd__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfsbp cell (
+    sky130_fd_sc_hd__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.v b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.v
index a658185..12b3fd7 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.v
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__dfstp cell (
+    sky130_fd_sc_hd__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfstp cell (
+    sky130_fd_sc_hd__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.v b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.v
index 69cb4d7..babe261 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.v
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__dfstp cell (
+    sky130_fd_sc_hd__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfstp cell (
+    sky130_fd_sc_hd__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.v b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.v
index b65ba1a..0511e20 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.v
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__dfstp cell (
+    sky130_fd_sc_hd__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfstp cell (
+    sky130_fd_sc_hd__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.v b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.v
index 2e1f328..33269c0 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.v
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dfxbp cell (
+    sky130_fd_sc_hd__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfxbp cell (
+    sky130_fd_sc_hd__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.v b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.v
index 0df61ff..6cce744 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.v
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dfxbp cell (
+    sky130_fd_sc_hd__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfxbp cell (
+    sky130_fd_sc_hd__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.v b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.v
index 0499409..a7a7280 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.v
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dfxtp cell (
+    sky130_fd_sc_hd__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfxtp cell (
+    sky130_fd_sc_hd__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.v b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.v
index 6d7776e..a2d9deb 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.v
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dfxtp cell (
+    sky130_fd_sc_hd__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfxtp cell (
+    sky130_fd_sc_hd__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.v b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.v
index 2b45211..fb59386 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.v
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dfxtp cell (
+    sky130_fd_sc_hd__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dfxtp cell (
+    sky130_fd_sc_hd__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/diode/sky130_fd_sc_hd__diode_2.v b/cells/diode/sky130_fd_sc_hd__diode_2.v
index c6a252d..5ce19f1 100644
--- a/cells/diode/sky130_fd_sc_hd__diode_2.v
+++ b/cells/diode/sky130_fd_sc_hd__diode_2.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hd__diode cell (
+    sky130_fd_sc_hd__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__diode cell (
+    sky130_fd_sc_hd__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.v b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.v
index 014731a..8081df2 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.v
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlclkp cell (
+    sky130_fd_sc_hd__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlclkp cell (
+    sky130_fd_sc_hd__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.v b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.v
index 70d5661..22dd069 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.v
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlclkp cell (
+    sky130_fd_sc_hd__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlclkp cell (
+    sky130_fd_sc_hd__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.v b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.v
index 31f71ad..c16b443 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.v
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlclkp cell (
+    sky130_fd_sc_hd__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlclkp cell (
+    sky130_fd_sc_hd__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.v b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.v
index 8ccb786..0c0509e 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.v
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrbn cell (
+    sky130_fd_sc_hd__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrbn cell (
+    sky130_fd_sc_hd__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.v b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.v
index 947e0c8..77e971c 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.v
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrbn cell (
+    sky130_fd_sc_hd__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrbn cell (
+    sky130_fd_sc_hd__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.v b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.v
index e9d1c34..ba79022 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.v
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrbp cell (
+    sky130_fd_sc_hd__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrbp cell (
+    sky130_fd_sc_hd__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.v b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.v
index 0020498..f4e06ab 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.v
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrbp cell (
+    sky130_fd_sc_hd__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrbp cell (
+    sky130_fd_sc_hd__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.v b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.v
index 5dad23c..545de98 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.v
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrtn cell (
+    sky130_fd_sc_hd__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrtn cell (
+    sky130_fd_sc_hd__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.v b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.v
index b1076ee..b57fdff 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.v
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrtn cell (
+    sky130_fd_sc_hd__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrtn cell (
+    sky130_fd_sc_hd__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.v b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.v
index faf01e6..952c0e7 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.v
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrtn cell (
+    sky130_fd_sc_hd__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrtn cell (
+    sky130_fd_sc_hd__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.v b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.v
index dd68428..0d23f21 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.v
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrtp cell (
+    sky130_fd_sc_hd__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrtp cell (
+    sky130_fd_sc_hd__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.v b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.v
index 9bb809c..6f5369a 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.v
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrtp cell (
+    sky130_fd_sc_hd__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrtp cell (
+    sky130_fd_sc_hd__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.v b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.v
index 4931692..e9d3b2b 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.v
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__dlrtp cell (
+    sky130_fd_sc_hd__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlrtp cell (
+    sky130_fd_sc_hd__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.v b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.v
index cae895d..39cbb7f 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.v
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.v
@@ -55,7 +55,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hd__dlxbn cell (
+    sky130_fd_sc_hd__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlxbn cell (
+    sky130_fd_sc_hd__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.v b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.v
index ddb79f2..519e4d2 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.v
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.v
@@ -55,7 +55,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hd__dlxbn cell (
+    sky130_fd_sc_hd__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlxbn cell (
+    sky130_fd_sc_hd__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.v b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.v
index 6603bdf..26a02be 100644
--- a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.v
+++ b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlxbp cell (
+    sky130_fd_sc_hd__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlxbp cell (
+    sky130_fd_sc_hd__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.v b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.v
index 2f6a25f..f3e5007 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.v
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hd__dlxtn cell (
+    sky130_fd_sc_hd__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlxtn cell (
+    sky130_fd_sc_hd__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.v b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.v
index edabfc3..320eaed 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.v
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hd__dlxtn cell (
+    sky130_fd_sc_hd__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlxtn cell (
+    sky130_fd_sc_hd__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.v b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.v
index c024b76..098f4a0 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.v
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hd__dlxtn cell (
+    sky130_fd_sc_hd__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlxtn cell (
+    sky130_fd_sc_hd__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.v b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.v
index a56e248..d6ac493 100644
--- a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.v
+++ b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlxtp cell (
+    sky130_fd_sc_hd__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlxtp cell (
+    sky130_fd_sc_hd__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE)
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.v b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.v
index 2053906..b94f1e5 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlygate4sd1 cell (
+    sky130_fd_sc_hd__dlygate4sd1 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlygate4sd1 cell (
+    sky130_fd_sc_hd__dlygate4sd1 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.v b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.v
index b42aa19..80d1861 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlygate4sd2 cell (
+    sky130_fd_sc_hd__dlygate4sd2 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlygate4sd2 cell (
+    sky130_fd_sc_hd__dlygate4sd2 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.v b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.v
index 4a6414e..ff092d1 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlygate4sd3 cell (
+    sky130_fd_sc_hd__dlygate4sd3 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlygate4sd3 cell (
+    sky130_fd_sc_hd__dlygate4sd3 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.v b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.v
index a236458..954270a 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlymetal6s2s cell (
+    sky130_fd_sc_hd__dlymetal6s2s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlymetal6s2s cell (
+    sky130_fd_sc_hd__dlymetal6s2s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.v b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.v
index 3fdf021..61a59c0 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlymetal6s4s cell (
+    sky130_fd_sc_hd__dlymetal6s4s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlymetal6s4s cell (
+    sky130_fd_sc_hd__dlymetal6s4s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.v b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.v
index 667d58e..55dcae4 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__dlymetal6s6s cell (
+    sky130_fd_sc_hd__dlymetal6s6s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__dlymetal6s6s cell (
+    sky130_fd_sc_hd__dlymetal6s6s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.v b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.v
index ee641ad..1b782fa 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.v
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__ebufn cell (
+    sky130_fd_sc_hd__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__ebufn cell (
+    sky130_fd_sc_hd__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.v b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.v
index 896e39d..099feb3 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.v
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__ebufn cell (
+    sky130_fd_sc_hd__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__ebufn cell (
+    sky130_fd_sc_hd__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.v b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.v
index d81d3a7..b557993 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.v
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__ebufn cell (
+    sky130_fd_sc_hd__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__ebufn cell (
+    sky130_fd_sc_hd__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.v b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.v
index 7a36204..a386c35 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.v
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__ebufn cell (
+    sky130_fd_sc_hd__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__ebufn cell (
+    sky130_fd_sc_hd__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.v b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.v
index 4c29049..fb3e3cc 100644
--- a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.v
+++ b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__edfxbp cell (
+    sky130_fd_sc_hd__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__edfxbp cell (
+    sky130_fd_sc_hd__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.v b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.v
index ac6b8c7..0de4180 100644
--- a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.v
+++ b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.v
@@ -56,7 +56,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__edfxtp cell (
+    sky130_fd_sc_hd__edfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__edfxtp cell (
+    sky130_fd_sc_hd__edfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_0.v b/cells/einvn/sky130_fd_sc_hd__einvn_0.v
index 8273989..10e18f7 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_0.v
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_1.v b/cells/einvn/sky130_fd_sc_hd__einvn_1.v
index 67875e5..5c5bfe7 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_1.v
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_2.v b/cells/einvn/sky130_fd_sc_hd__einvn_2.v
index d20426f..48d9748 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_2.v
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_4.v b/cells/einvn/sky130_fd_sc_hd__einvn_4.v
index 79a97bc..05c0c8f 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_4.v
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_8.v b/cells/einvn/sky130_fd_sc_hd__einvn_8.v
index 5a307dc..3c02c7f 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_8.v
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvn cell (
+    sky130_fd_sc_hd__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_1.v b/cells/einvp/sky130_fd_sc_hd__einvp_1.v
index 12d15c1..c4772cc 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_1.v
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvp cell (
+    sky130_fd_sc_hd__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvp cell (
+    sky130_fd_sc_hd__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_2.v b/cells/einvp/sky130_fd_sc_hd__einvp_2.v
index d2e5fcc..5141bb6 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_2.v
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvp cell (
+    sky130_fd_sc_hd__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvp cell (
+    sky130_fd_sc_hd__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_4.v b/cells/einvp/sky130_fd_sc_hd__einvp_4.v
index acbdaf4..0d9e602 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_4.v
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvp cell (
+    sky130_fd_sc_hd__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvp cell (
+    sky130_fd_sc_hd__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_8.v b/cells/einvp/sky130_fd_sc_hd__einvp_8.v
index b3457a9..8262b57 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_8.v
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__einvp cell (
+    sky130_fd_sc_hd__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__einvp cell (
+    sky130_fd_sc_hd__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/fa/sky130_fd_sc_hd__fa_1.v b/cells/fa/sky130_fd_sc_hd__fa_1.v
index 8466d4f..51c01e0 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_1.v
+++ b/cells/fa/sky130_fd_sc_hd__fa_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__fa cell (
+    sky130_fd_sc_hd__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fa cell (
+    sky130_fd_sc_hd__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_hd__fa_2.v b/cells/fa/sky130_fd_sc_hd__fa_2.v
index 1d47737..e4b2e07 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_2.v
+++ b/cells/fa/sky130_fd_sc_hd__fa_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__fa cell (
+    sky130_fd_sc_hd__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fa cell (
+    sky130_fd_sc_hd__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_hd__fa_4.v b/cells/fa/sky130_fd_sc_hd__fa_4.v
index 6636c2a..8258f76 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_4.v
+++ b/cells/fa/sky130_fd_sc_hd__fa_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__fa cell (
+    sky130_fd_sc_hd__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fa cell (
+    sky130_fd_sc_hd__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_hd__fah_1.v b/cells/fah/sky130_fd_sc_hd__fah_1.v
index 1abc448..90f9a31 100644
--- a/cells/fah/sky130_fd_sc_hd__fah_1.v
+++ b/cells/fah/sky130_fd_sc_hd__fah_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__fah cell (
+    sky130_fd_sc_hd__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fah cell (
+    sky130_fd_sc_hd__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.v b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.v
index 79f845e..dc6f283 100644
--- a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.v
+++ b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__fahcin cell (
+    sky130_fd_sc_hd__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fahcin cell (
+    sky130_fd_sc_hd__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.v b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.v
index 0167209..9244ca2 100644
--- a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.v
+++ b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.v
@@ -57,7 +57,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_hd__fahcon cell (
+    sky130_fd_sc_hd__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fahcon cell (
+    sky130_fd_sc_hd__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fill/sky130_fd_sc_hd__fill_1.v b/cells/fill/sky130_fd_sc_hd__fill_1.v
index 3cf63da..4da106e 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_1.v
+++ b/cells/fill/sky130_fd_sc_hd__fill_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__fill cell (
+    sky130_fd_sc_hd__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fill cell ();
+    sky130_fd_sc_hd__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hd__fill_2.v b/cells/fill/sky130_fd_sc_hd__fill_2.v
index ecd809c..0fd1111 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_2.v
+++ b/cells/fill/sky130_fd_sc_hd__fill_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__fill cell (
+    sky130_fd_sc_hd__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fill cell ();
+    sky130_fd_sc_hd__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hd__fill_4.v b/cells/fill/sky130_fd_sc_hd__fill_4.v
index e5a730f..914ee80 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_4.v
+++ b/cells/fill/sky130_fd_sc_hd__fill_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__fill cell (
+    sky130_fd_sc_hd__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fill cell ();
+    sky130_fd_sc_hd__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hd__fill_8.v b/cells/fill/sky130_fd_sc_hd__fill_8.v
index 41fc844..2e1e5f7 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_8.v
+++ b/cells/fill/sky130_fd_sc_hd__fill_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__fill cell (
+    sky130_fd_sc_hd__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__fill cell ();
+    sky130_fd_sc_hd__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/ha/sky130_fd_sc_hd__ha_1.v b/cells/ha/sky130_fd_sc_hd__ha_1.v
index ada412d..dc0965e 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_1.v
+++ b/cells/ha/sky130_fd_sc_hd__ha_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__ha cell (
+    sky130_fd_sc_hd__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__ha cell (
+    sky130_fd_sc_hd__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_hd__ha_2.v b/cells/ha/sky130_fd_sc_hd__ha_2.v
index ae644b4..95e3e01 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_2.v
+++ b/cells/ha/sky130_fd_sc_hd__ha_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__ha cell (
+    sky130_fd_sc_hd__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__ha cell (
+    sky130_fd_sc_hd__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_hd__ha_4.v b/cells/ha/sky130_fd_sc_hd__ha_4.v
index 1f8a249..2970c38 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_4.v
+++ b/cells/ha/sky130_fd_sc_hd__ha_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__ha cell (
+    sky130_fd_sc_hd__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__ha cell (
+    sky130_fd_sc_hd__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/inv/sky130_fd_sc_hd__inv_1.v b/cells/inv/sky130_fd_sc_hd__inv_1.v
index c9a1a19..7797dc6 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_1.v
+++ b/cells/inv/sky130_fd_sc_hd__inv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hd__inv_12.v b/cells/inv/sky130_fd_sc_hd__inv_12.v
index a1881e5..631fce0 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_12.v
+++ b/cells/inv/sky130_fd_sc_hd__inv_12.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hd__inv_16.v b/cells/inv/sky130_fd_sc_hd__inv_16.v
index ec07d73..09dd9bf 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_16.v
+++ b/cells/inv/sky130_fd_sc_hd__inv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hd__inv_2.v b/cells/inv/sky130_fd_sc_hd__inv_2.v
index 858dfd2..99a9681 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_2.v
+++ b/cells/inv/sky130_fd_sc_hd__inv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hd__inv_4.v b/cells/inv/sky130_fd_sc_hd__inv_4.v
index cc8b2e1..9969fce 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_4.v
+++ b/cells/inv/sky130_fd_sc_hd__inv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hd__inv_6.v b/cells/inv/sky130_fd_sc_hd__inv_6.v
index adb96ac..45130c2 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_6.v
+++ b/cells/inv/sky130_fd_sc_hd__inv_6.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hd__inv_8.v b/cells/inv/sky130_fd_sc_hd__inv_8.v
index cbbf050..33a3a06 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_8.v
+++ b/cells/inv/sky130_fd_sc_hd__inv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__inv cell (
+    sky130_fd_sc_hd__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.v b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.v
index b2626b4..33baba7 100644
--- a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.v
+++ b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hd__lpflow_bleeder cell (
+    sky130_fd_sc_hd__lpflow_bleeder base (
         .SHORT(SHORT),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_bleeder cell (
+    sky130_fd_sc_hd__lpflow_bleeder base (
         .SHORT(SHORT)
     );
 
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.v b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.v
index aa059be..48d5b19 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.v
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.v b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.v
index 6eb61bc..a02d01b 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.v
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.v b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.v
index 3b27b43..cb649bb 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.v
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.v b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.v
index 35fd06b..4ec65e1 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.v
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.v b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.v
index bbfa925..a056483 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.v
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkbufkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkbufkapwr base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.v b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.v
index 7e09280..341877e 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.v
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.v b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.v
index cf4fdea..ea04812 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.v
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.v b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.v
index 713ffdf..a83ba51 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.v
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.v b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.v
index 81dbf09..a1c07c7 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.v
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.v b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.v
index d845736..cd5b742 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.v
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.v
@@ -53,7 +53,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A),
         .KAPWR(KAPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_clkinvkapwr cell (
+    sky130_fd_sc_hd__lpflow_clkinvkapwr base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.v b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.v
index 9f18838..c03f918 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.v
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.v
@@ -50,7 +50,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hd__lpflow_decapkapwr cell (
+    sky130_fd_sc_hd__lpflow_decapkapwr base (
         .VPWR(VPWR),
         .KAPWR(KAPWR),
         .VGND(VGND),
@@ -87,7 +87,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_decapkapwr cell ();
+    sky130_fd_sc_hd__lpflow_decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.v b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.v
index dbbf6e6..fcf3a05 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.v
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.v
@@ -51,7 +51,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hd__lpflow_decapkapwr cell (
+    sky130_fd_sc_hd__lpflow_decapkapwr base (
         .VPWR(VPWR),
         .KAPWR(KAPWR),
         .VGND(VGND),
@@ -88,7 +88,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_decapkapwr cell ();
+    sky130_fd_sc_hd__lpflow_decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.v b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.v
index a01d4e3..5061dad 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.v
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.v
@@ -50,7 +50,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hd__lpflow_decapkapwr cell (
+    sky130_fd_sc_hd__lpflow_decapkapwr base (
         .VPWR(VPWR),
         .KAPWR(KAPWR),
         .VGND(VGND),
@@ -87,7 +87,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_decapkapwr cell ();
+    sky130_fd_sc_hd__lpflow_decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.v b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.v
index 1f3ae2f..7eb7a89 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.v
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.v
@@ -50,7 +50,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hd__lpflow_decapkapwr cell (
+    sky130_fd_sc_hd__lpflow_decapkapwr base (
         .VPWR(VPWR),
         .KAPWR(KAPWR),
         .VGND(VGND),
@@ -87,7 +87,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_decapkapwr cell ();
+    sky130_fd_sc_hd__lpflow_decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.v b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.v
index 628f371..081e632 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.v
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.v
@@ -50,7 +50,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hd__lpflow_decapkapwr cell (
+    sky130_fd_sc_hd__lpflow_decapkapwr base (
         .VPWR(VPWR),
         .KAPWR(KAPWR),
         .VGND(VGND),
@@ -87,7 +87,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_decapkapwr cell ();
+    sky130_fd_sc_hd__lpflow_decapkapwr base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.v b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.v
index d6e8010..b70350f 100644
--- a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.v
+++ b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__lpflow_inputiso0n cell (
+    sky130_fd_sc_hd__lpflow_inputiso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_inputiso0n cell (
+    sky130_fd_sc_hd__lpflow_inputiso0n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.v b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.v
index dd492dd..08320d3 100644
--- a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.v
+++ b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_inputiso0p cell (
+    sky130_fd_sc_hd__lpflow_inputiso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_inputiso0p cell (
+    sky130_fd_sc_hd__lpflow_inputiso0p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.v b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.v
index fa590bc..2449af1 100644
--- a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.v
+++ b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__lpflow_inputiso1n cell (
+    sky130_fd_sc_hd__lpflow_inputiso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_inputiso1n cell (
+    sky130_fd_sc_hd__lpflow_inputiso1n base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.v b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.v
index ed771bc..abbc6e4 100644
--- a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.v
+++ b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_inputiso1p cell (
+    sky130_fd_sc_hd__lpflow_inputiso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_inputiso1p cell (
+    sky130_fd_sc_hd__lpflow_inputiso1p base (
         .X(X),
         .A(A),
         .SLEEP(SLEEP)
diff --git a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.v b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.v
index 37378e1..e5fc0ac 100644
--- a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.v
+++ b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.v
@@ -53,7 +53,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__lpflow_inputisolatch cell (
+    sky130_fd_sc_hd__lpflow_inputisolatch base (
         .Q(Q),
         .D(D),
         .SLEEP_B(SLEEP_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_inputisolatch cell (
+    sky130_fd_sc_hd__lpflow_inputisolatch base (
         .Q(Q),
         .D(D),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.v b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.v
index 953ce9e..7895442 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.v
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.v b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.v
index 6c68c9b..7e1c1c3 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.v
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.v b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.v
index 3b590ad..6a6d6ef 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.v
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.v b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.v
index c9577ac..37b9f82 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.v
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.v b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.v
index 5a8e305..43908e6 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.v
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__lpflow_isobufsrc cell (
+    sky130_fd_sc_hd__lpflow_isobufsrc base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.v b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.v
index 1d3be42..9329b68 100644
--- a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.v
+++ b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.v
@@ -58,7 +58,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__lpflow_isobufsrckapwr cell (
+    sky130_fd_sc_hd__lpflow_isobufsrckapwr base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A),
@@ -104,7 +104,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hd__lpflow_isobufsrckapwr cell (
+    sky130_fd_sc_hd__lpflow_isobufsrckapwr base (
         .X(X),
         .SLEEP(SLEEP),
         .A(A)
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.v b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.v
index cddcf5a..59c8352 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.v
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.v
@@ -55,7 +55,7 @@
     input  VPWR  ;
     input  VGND  ;
     input  VPB   ;
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap base (
         .X(X),
         .A(A),
         .VPWRIN(VPWRIN),
@@ -94,7 +94,7 @@
     supply0 VGND  ;
     supply1 VPB   ;
 
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.v b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.v
index 378dce3..9be6052 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.v
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.v
@@ -55,7 +55,7 @@
     input  VPWR  ;
     input  VGND  ;
     input  VPB   ;
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap base (
         .X(X),
         .A(A),
         .VPWRIN(VPWRIN),
@@ -94,7 +94,7 @@
     supply0 VGND  ;
     supply1 VPB   ;
 
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.v b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.v
index 2ff6f8b..5df3ed4 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.v
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.v
@@ -55,7 +55,7 @@
     input  VPWR  ;
     input  VGND  ;
     input  VPB   ;
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap base (
         .X(X),
         .A(A),
         .VPWRIN(VPWRIN),
@@ -94,7 +94,7 @@
     supply0 VGND  ;
     supply1 VPB   ;
 
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.v b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.v
index 02f1355..0155566 100644
--- a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.v
+++ b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.v
@@ -55,7 +55,7 @@
     input  VGND    ;
     input  VPB     ;
     input  VNB     ;
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell base (
         .X(X),
         .A(A),
         .LOWLVPWR(LOWLVPWR),
@@ -98,7 +98,7 @@
     supply1 VPB     ;
     supply0 VNB     ;
 
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.v b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.v
index c36a297..adc3081 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.v
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.v
@@ -54,7 +54,7 @@
     input  VPWR    ;
     input  VGND    ;
     input  VPB     ;
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap base (
         .X(X),
         .A(A),
         .LOWLVPWR(LOWLVPWR),
@@ -93,7 +93,7 @@
     supply0 VGND    ;
     supply1 VPB     ;
 
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.v b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.v
index 4531920..1c6aa7b 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.v
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.v
@@ -54,7 +54,7 @@
     input  VPWR    ;
     input  VGND    ;
     input  VPB     ;
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap base (
         .X(X),
         .A(A),
         .LOWLVPWR(LOWLVPWR),
@@ -93,7 +93,7 @@
     supply0 VGND    ;
     supply1 VPB     ;
 
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.v b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.v
index f4abd31..f03b101 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.v
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.v
@@ -54,7 +54,7 @@
     input  VPWR    ;
     input  VGND    ;
     input  VPB     ;
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap base (
         .X(X),
         .A(A),
         .LOWLVPWR(LOWLVPWR),
@@ -93,7 +93,7 @@
     supply0 VGND    ;
     supply1 VPB     ;
 
-    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap cell (
+    sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap base (
         .X(X),
         .A(A)
     );
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_1.v b/cells/maj3/sky130_fd_sc_hd__maj3_1.v
index e078f49..d0770a6 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_1.v
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__maj3 cell (
+    sky130_fd_sc_hd__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__maj3 cell (
+    sky130_fd_sc_hd__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_2.v b/cells/maj3/sky130_fd_sc_hd__maj3_2.v
index 89f7007..3781483 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_2.v
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__maj3 cell (
+    sky130_fd_sc_hd__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__maj3 cell (
+    sky130_fd_sc_hd__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_4.v b/cells/maj3/sky130_fd_sc_hd__maj3_4.v
index 96dbcfe..ae7ce05 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_4.v
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__maj3 cell (
+    sky130_fd_sc_hd__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__maj3 cell (
+    sky130_fd_sc_hd__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_1.v b/cells/mux2/sky130_fd_sc_hd__mux2_1.v
index 6e00fc7..6dd99af 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_1.v
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux2 cell (
+    sky130_fd_sc_hd__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux2 cell (
+    sky130_fd_sc_hd__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_2.v b/cells/mux2/sky130_fd_sc_hd__mux2_2.v
index dfb2ccc..2f95039 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_2.v
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux2 cell (
+    sky130_fd_sc_hd__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux2 cell (
+    sky130_fd_sc_hd__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_4.v b/cells/mux2/sky130_fd_sc_hd__mux2_4.v
index 355fffd..0322ea4 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_4.v
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux2 cell (
+    sky130_fd_sc_hd__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux2 cell (
+    sky130_fd_sc_hd__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_8.v b/cells/mux2/sky130_fd_sc_hd__mux2_8.v
index 76d2fa8..a9acaa9 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_8.v
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_8.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux2 cell (
+    sky130_fd_sc_hd__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux2 cell (
+    sky130_fd_sc_hd__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.v b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.v
index 448ddc2..262662b 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.v
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux2i cell (
+    sky130_fd_sc_hd__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux2i cell (
+    sky130_fd_sc_hd__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.v b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.v
index f427d5a..f413635 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.v
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux2i cell (
+    sky130_fd_sc_hd__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux2i cell (
+    sky130_fd_sc_hd__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.v b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.v
index e371f0b..96a2160 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.v
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux2i cell (
+    sky130_fd_sc_hd__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux2i cell (
+    sky130_fd_sc_hd__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_1.v b/cells/mux4/sky130_fd_sc_hd__mux4_1.v
index 2de98b1..9571e51 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_1.v
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux4 cell (
+    sky130_fd_sc_hd__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux4 cell (
+    sky130_fd_sc_hd__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_2.v b/cells/mux4/sky130_fd_sc_hd__mux4_2.v
index 7fc334b..4db561f 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_2.v
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux4 cell (
+    sky130_fd_sc_hd__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux4 cell (
+    sky130_fd_sc_hd__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_4.v b/cells/mux4/sky130_fd_sc_hd__mux4_4.v
index 62aef15..e1e5055 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_4.v
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__mux4 cell (
+    sky130_fd_sc_hd__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__mux4 cell (
+    sky130_fd_sc_hd__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_1.v b/cells/nand2/sky130_fd_sc_hd__nand2_1.v
index 8c424cb..634691a 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_1.v
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand2 cell (
+    sky130_fd_sc_hd__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand2 cell (
+    sky130_fd_sc_hd__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_2.v b/cells/nand2/sky130_fd_sc_hd__nand2_2.v
index 28d3d3d..1d20414 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_2.v
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand2 cell (
+    sky130_fd_sc_hd__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand2 cell (
+    sky130_fd_sc_hd__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_4.v b/cells/nand2/sky130_fd_sc_hd__nand2_4.v
index b4e6f32..4e15508 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_4.v
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand2 cell (
+    sky130_fd_sc_hd__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand2 cell (
+    sky130_fd_sc_hd__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_8.v b/cells/nand2/sky130_fd_sc_hd__nand2_8.v
index f7a74e2..1da3881 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_8.v
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand2 cell (
+    sky130_fd_sc_hd__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand2 cell (
+    sky130_fd_sc_hd__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.v b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.v
index ce20cd5..df56880 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.v
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand2b cell (
+    sky130_fd_sc_hd__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand2b cell (
+    sky130_fd_sc_hd__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.v b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.v
index e2c0239..9028391 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.v
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand2b cell (
+    sky130_fd_sc_hd__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand2b cell (
+    sky130_fd_sc_hd__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.v b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.v
index a7dc490..d31120a 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.v
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand2b cell (
+    sky130_fd_sc_hd__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand2b cell (
+    sky130_fd_sc_hd__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_1.v b/cells/nand3/sky130_fd_sc_hd__nand3_1.v
index 7331a84..8f2ce54 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_1.v
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand3 cell (
+    sky130_fd_sc_hd__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand3 cell (
+    sky130_fd_sc_hd__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_2.v b/cells/nand3/sky130_fd_sc_hd__nand3_2.v
index d148313..375919a 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_2.v
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand3 cell (
+    sky130_fd_sc_hd__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand3 cell (
+    sky130_fd_sc_hd__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_4.v b/cells/nand3/sky130_fd_sc_hd__nand3_4.v
index 0c185b8..3a0562e 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_4.v
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand3 cell (
+    sky130_fd_sc_hd__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand3 cell (
+    sky130_fd_sc_hd__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.v b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.v
index 3a700da..9ebcbbb 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.v
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand3b cell (
+    sky130_fd_sc_hd__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand3b cell (
+    sky130_fd_sc_hd__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.v b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.v
index 1df50dd..7316de5 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.v
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand3b cell (
+    sky130_fd_sc_hd__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand3b cell (
+    sky130_fd_sc_hd__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.v b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.v
index 3b8ca00..7d15fee 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.v
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand3b cell (
+    sky130_fd_sc_hd__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand3b cell (
+    sky130_fd_sc_hd__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_1.v b/cells/nand4/sky130_fd_sc_hd__nand4_1.v
index d4d6513..e251c06 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_1.v
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4 cell (
+    sky130_fd_sc_hd__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4 cell (
+    sky130_fd_sc_hd__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_2.v b/cells/nand4/sky130_fd_sc_hd__nand4_2.v
index 62115e7..5dd0366 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_2.v
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4 cell (
+    sky130_fd_sc_hd__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4 cell (
+    sky130_fd_sc_hd__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_4.v b/cells/nand4/sky130_fd_sc_hd__nand4_4.v
index b92d1b3..04b001a 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_4.v
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4 cell (
+    sky130_fd_sc_hd__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4 cell (
+    sky130_fd_sc_hd__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.v b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.v
index fbb0343..94245d4 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.v
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4b cell (
+    sky130_fd_sc_hd__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4b cell (
+    sky130_fd_sc_hd__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.v b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.v
index b0ae962..f3e41b4 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.v
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4b cell (
+    sky130_fd_sc_hd__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4b cell (
+    sky130_fd_sc_hd__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.v b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.v
index 9019f23..dac4889 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.v
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4b cell (
+    sky130_fd_sc_hd__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4b cell (
+    sky130_fd_sc_hd__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.v b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.v
index 852008d..ebcb0eb 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.v
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4bb cell (
+    sky130_fd_sc_hd__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4bb cell (
+    sky130_fd_sc_hd__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.v b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.v
index dc3f917..f8e6f60 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.v
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4bb cell (
+    sky130_fd_sc_hd__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4bb cell (
+    sky130_fd_sc_hd__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.v b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.v
index 61f30ac..9eb69b9 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.v
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nand4bb cell (
+    sky130_fd_sc_hd__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nand4bb cell (
+    sky130_fd_sc_hd__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_1.v b/cells/nor2/sky130_fd_sc_hd__nor2_1.v
index 2f02f60..9e7da92 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_1.v
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor2 cell (
+    sky130_fd_sc_hd__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor2 cell (
+    sky130_fd_sc_hd__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_2.v b/cells/nor2/sky130_fd_sc_hd__nor2_2.v
index bbacdaa..7b765f1 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_2.v
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor2 cell (
+    sky130_fd_sc_hd__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor2 cell (
+    sky130_fd_sc_hd__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_4.v b/cells/nor2/sky130_fd_sc_hd__nor2_4.v
index 069c0ba..af34e4c 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_4.v
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor2 cell (
+    sky130_fd_sc_hd__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor2 cell (
+    sky130_fd_sc_hd__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_8.v b/cells/nor2/sky130_fd_sc_hd__nor2_8.v
index 84a8032..0628add 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_8.v
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor2 cell (
+    sky130_fd_sc_hd__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor2 cell (
+    sky130_fd_sc_hd__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.v b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.v
index e6b676d..e91866a 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.v
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor2b cell (
+    sky130_fd_sc_hd__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor2b cell (
+    sky130_fd_sc_hd__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.v b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.v
index c6890b8..2be6620 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.v
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor2b cell (
+    sky130_fd_sc_hd__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor2b cell (
+    sky130_fd_sc_hd__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.v b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.v
index 1f83b75..a771dfe 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.v
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor2b cell (
+    sky130_fd_sc_hd__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor2b cell (
+    sky130_fd_sc_hd__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_1.v b/cells/nor3/sky130_fd_sc_hd__nor3_1.v
index fe6f92c..d30220d 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_1.v
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor3 cell (
+    sky130_fd_sc_hd__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor3 cell (
+    sky130_fd_sc_hd__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_2.v b/cells/nor3/sky130_fd_sc_hd__nor3_2.v
index 6b3f84d..3c67cd6 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_2.v
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor3 cell (
+    sky130_fd_sc_hd__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor3 cell (
+    sky130_fd_sc_hd__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_4.v b/cells/nor3/sky130_fd_sc_hd__nor3_4.v
index 50a7624..485eb44 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_4.v
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor3 cell (
+    sky130_fd_sc_hd__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor3 cell (
+    sky130_fd_sc_hd__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.v b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.v
index a274e27..ae159d8 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.v
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor3b cell (
+    sky130_fd_sc_hd__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor3b cell (
+    sky130_fd_sc_hd__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.v b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.v
index 0159394..d8899ee 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.v
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor3b cell (
+    sky130_fd_sc_hd__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor3b cell (
+    sky130_fd_sc_hd__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.v b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.v
index 7648277..a57a369 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.v
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor3b cell (
+    sky130_fd_sc_hd__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor3b cell (
+    sky130_fd_sc_hd__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_1.v b/cells/nor4/sky130_fd_sc_hd__nor4_1.v
index 447a274..626f1a6 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_1.v
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4 cell (
+    sky130_fd_sc_hd__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4 cell (
+    sky130_fd_sc_hd__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_2.v b/cells/nor4/sky130_fd_sc_hd__nor4_2.v
index 3f281ee..8571e2c 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_2.v
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4 cell (
+    sky130_fd_sc_hd__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4 cell (
+    sky130_fd_sc_hd__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_4.v b/cells/nor4/sky130_fd_sc_hd__nor4_4.v
index bca1686..9586593 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_4.v
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4 cell (
+    sky130_fd_sc_hd__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4 cell (
+    sky130_fd_sc_hd__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.v b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.v
index 2bee168..a7b15b3 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.v
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4b cell (
+    sky130_fd_sc_hd__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4b cell (
+    sky130_fd_sc_hd__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.v b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.v
index 46352e6..a5a3d84 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.v
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4b cell (
+    sky130_fd_sc_hd__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4b cell (
+    sky130_fd_sc_hd__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.v b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.v
index 40115c1..642d35d 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.v
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4b cell (
+    sky130_fd_sc_hd__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4b cell (
+    sky130_fd_sc_hd__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.v b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.v
index fb76399..bfbbb76 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.v
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4bb cell (
+    sky130_fd_sc_hd__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4bb cell (
+    sky130_fd_sc_hd__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.v b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.v
index fc735d1..a0bd71f 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.v
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4bb cell (
+    sky130_fd_sc_hd__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4bb cell (
+    sky130_fd_sc_hd__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.v b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.v
index 237b6f3..cb932fd 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.v
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__nor4bb cell (
+    sky130_fd_sc_hd__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__nor4bb cell (
+    sky130_fd_sc_hd__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.v b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.v
index 91bdb39..f7042f3 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.v
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2111a cell (
+    sky130_fd_sc_hd__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2111a cell (
+    sky130_fd_sc_hd__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.v b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.v
index 8c53b06..78eb841 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.v
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2111a cell (
+    sky130_fd_sc_hd__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2111a cell (
+    sky130_fd_sc_hd__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.v b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.v
index c862e35..6fac910 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.v
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2111a cell (
+    sky130_fd_sc_hd__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2111a cell (
+    sky130_fd_sc_hd__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.v b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.v
index 19d4fff..9a34f1e 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.v
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2111ai cell (
+    sky130_fd_sc_hd__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2111ai cell (
+    sky130_fd_sc_hd__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.v b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.v
index 7426f64..6734114 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.v
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2111ai cell (
+    sky130_fd_sc_hd__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2111ai cell (
+    sky130_fd_sc_hd__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.v b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.v
index 2739400..ecb6dd1 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.v
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2111ai cell (
+    sky130_fd_sc_hd__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2111ai cell (
+    sky130_fd_sc_hd__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_1.v b/cells/o211a/sky130_fd_sc_hd__o211a_1.v
index a261ec2..9127105 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_1.v
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o211a cell (
+    sky130_fd_sc_hd__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o211a cell (
+    sky130_fd_sc_hd__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_2.v b/cells/o211a/sky130_fd_sc_hd__o211a_2.v
index 151048a..c1751ce 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_2.v
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o211a cell (
+    sky130_fd_sc_hd__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o211a cell (
+    sky130_fd_sc_hd__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_4.v b/cells/o211a/sky130_fd_sc_hd__o211a_4.v
index 04aba47..e9fbfe6 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_4.v
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o211a cell (
+    sky130_fd_sc_hd__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o211a cell (
+    sky130_fd_sc_hd__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.v b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.v
index b2fd382..6e12085 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.v
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o211ai cell (
+    sky130_fd_sc_hd__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o211ai cell (
+    sky130_fd_sc_hd__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.v b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.v
index 1a4b000..08f9cf9 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.v
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o211ai cell (
+    sky130_fd_sc_hd__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o211ai cell (
+    sky130_fd_sc_hd__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.v b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.v
index 5bd8000..9072518 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.v
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o211ai cell (
+    sky130_fd_sc_hd__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o211ai cell (
+    sky130_fd_sc_hd__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_1.v b/cells/o21a/sky130_fd_sc_hd__o21a_1.v
index 2a8ea38..a075f32 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_1.v
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21a cell (
+    sky130_fd_sc_hd__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21a cell (
+    sky130_fd_sc_hd__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_2.v b/cells/o21a/sky130_fd_sc_hd__o21a_2.v
index 98ad30d..2febd5e 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_2.v
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21a cell (
+    sky130_fd_sc_hd__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21a cell (
+    sky130_fd_sc_hd__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_4.v b/cells/o21a/sky130_fd_sc_hd__o21a_4.v
index 0ae2d53..8480085 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_4.v
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21a cell (
+    sky130_fd_sc_hd__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21a cell (
+    sky130_fd_sc_hd__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.v b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.v
index 1596cfd..2637f50 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.v
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21ai cell (
+    sky130_fd_sc_hd__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21ai cell (
+    sky130_fd_sc_hd__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.v b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.v
index 3dca445..4b9f433 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.v
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21ai cell (
+    sky130_fd_sc_hd__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21ai cell (
+    sky130_fd_sc_hd__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.v b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.v
index 3ee2b00..1a2af52 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.v
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21ai cell (
+    sky130_fd_sc_hd__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21ai cell (
+    sky130_fd_sc_hd__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.v b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.v
index e7dd6bb..9a051a3 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.v
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21ai cell (
+    sky130_fd_sc_hd__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21ai cell (
+    sky130_fd_sc_hd__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.v b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.v
index 3f11290..ee925a4 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.v
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21ba cell (
+    sky130_fd_sc_hd__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21ba cell (
+    sky130_fd_sc_hd__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.v b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.v
index 38980a0..eb606e0 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.v
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21ba cell (
+    sky130_fd_sc_hd__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21ba cell (
+    sky130_fd_sc_hd__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.v b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.v
index f063599..b46093a 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.v
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21ba cell (
+    sky130_fd_sc_hd__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21ba cell (
+    sky130_fd_sc_hd__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.v b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.v
index 9af4c45..7ffdab9 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.v
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21bai cell (
+    sky130_fd_sc_hd__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21bai cell (
+    sky130_fd_sc_hd__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.v b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.v
index 49f5b18..925e4f8 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.v
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21bai cell (
+    sky130_fd_sc_hd__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21bai cell (
+    sky130_fd_sc_hd__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.v b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.v
index ef5b261..6283ebb 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.v
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o21bai cell (
+    sky130_fd_sc_hd__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o21bai cell (
+    sky130_fd_sc_hd__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_1.v b/cells/o221a/sky130_fd_sc_hd__o221a_1.v
index beb761a..b9981bb 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_1.v
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o221a cell (
+    sky130_fd_sc_hd__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o221a cell (
+    sky130_fd_sc_hd__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_2.v b/cells/o221a/sky130_fd_sc_hd__o221a_2.v
index dc87653..2b2a3fd 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_2.v
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o221a cell (
+    sky130_fd_sc_hd__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o221a cell (
+    sky130_fd_sc_hd__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_4.v b/cells/o221a/sky130_fd_sc_hd__o221a_4.v
index a6d5cd1..55ecec6 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_4.v
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o221a cell (
+    sky130_fd_sc_hd__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o221a cell (
+    sky130_fd_sc_hd__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.v b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.v
index cbac977..819cd29 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.v
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o221ai cell (
+    sky130_fd_sc_hd__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o221ai cell (
+    sky130_fd_sc_hd__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.v b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.v
index ff770b2..144f9cf 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.v
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o221ai cell (
+    sky130_fd_sc_hd__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o221ai cell (
+    sky130_fd_sc_hd__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.v b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.v
index 45955e9..9631b6c 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.v
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o221ai cell (
+    sky130_fd_sc_hd__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o221ai cell (
+    sky130_fd_sc_hd__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_1.v b/cells/o22a/sky130_fd_sc_hd__o22a_1.v
index 85bc686..ffbaed2 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_1.v
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o22a cell (
+    sky130_fd_sc_hd__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o22a cell (
+    sky130_fd_sc_hd__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_2.v b/cells/o22a/sky130_fd_sc_hd__o22a_2.v
index 25ad8c9..7b26c68 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_2.v
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o22a cell (
+    sky130_fd_sc_hd__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o22a cell (
+    sky130_fd_sc_hd__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_4.v b/cells/o22a/sky130_fd_sc_hd__o22a_4.v
index 68fa564..0d7165f 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_4.v
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o22a cell (
+    sky130_fd_sc_hd__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o22a cell (
+    sky130_fd_sc_hd__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.v b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.v
index f090d92..932d227 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.v
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o22ai cell (
+    sky130_fd_sc_hd__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o22ai cell (
+    sky130_fd_sc_hd__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.v b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.v
index f2ebf45..cf6f70f 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.v
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o22ai cell (
+    sky130_fd_sc_hd__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o22ai cell (
+    sky130_fd_sc_hd__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.v b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.v
index 90d0787..4d1716d 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.v
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o22ai cell (
+    sky130_fd_sc_hd__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o22ai cell (
+    sky130_fd_sc_hd__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.v b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.v
index 51e7f20..ef8ad18 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.v
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2bb2a cell (
+    sky130_fd_sc_hd__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2bb2a cell (
+    sky130_fd_sc_hd__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.v b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.v
index 4194802..33d5c4b 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.v
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2bb2a cell (
+    sky130_fd_sc_hd__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2bb2a cell (
+    sky130_fd_sc_hd__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.v b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.v
index 1e9fa1b..bbd8c6b 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.v
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2bb2a cell (
+    sky130_fd_sc_hd__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2bb2a cell (
+    sky130_fd_sc_hd__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.v b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.v
index 6f5a0ea..c5418c7 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2bb2ai cell (
+    sky130_fd_sc_hd__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2bb2ai cell (
+    sky130_fd_sc_hd__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.v b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.v
index b2d7912..befa003 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2bb2ai cell (
+    sky130_fd_sc_hd__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2bb2ai cell (
+    sky130_fd_sc_hd__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.v b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.v
index 88ccfbf..9654952 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o2bb2ai cell (
+    sky130_fd_sc_hd__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o2bb2ai cell (
+    sky130_fd_sc_hd__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_1.v b/cells/o311a/sky130_fd_sc_hd__o311a_1.v
index 5d0670d..9f97600 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_1.v
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o311a cell (
+    sky130_fd_sc_hd__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o311a cell (
+    sky130_fd_sc_hd__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_2.v b/cells/o311a/sky130_fd_sc_hd__o311a_2.v
index 21c8aa5..041cd87 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_2.v
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o311a cell (
+    sky130_fd_sc_hd__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o311a cell (
+    sky130_fd_sc_hd__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_4.v b/cells/o311a/sky130_fd_sc_hd__o311a_4.v
index 15b8945..6f81d8f 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_4.v
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o311a cell (
+    sky130_fd_sc_hd__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o311a cell (
+    sky130_fd_sc_hd__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.v b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.v
index d220a72..acfab85 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.v
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o311ai cell (
+    sky130_fd_sc_hd__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o311ai cell (
+    sky130_fd_sc_hd__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.v b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.v
index 60837c3..43dc62f 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.v
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o311ai cell (
+    sky130_fd_sc_hd__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o311ai cell (
+    sky130_fd_sc_hd__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.v b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.v
index 8f4cf9a..615e4ad 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.v
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o311ai cell (
+    sky130_fd_sc_hd__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o311ai cell (
+    sky130_fd_sc_hd__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.v b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.v
index 25a181f..a154331 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.v
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o311ai cell (
+    sky130_fd_sc_hd__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o311ai cell (
+    sky130_fd_sc_hd__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_1.v b/cells/o31a/sky130_fd_sc_hd__o31a_1.v
index 1fe558a..7b467dd 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_1.v
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o31a cell (
+    sky130_fd_sc_hd__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o31a cell (
+    sky130_fd_sc_hd__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_2.v b/cells/o31a/sky130_fd_sc_hd__o31a_2.v
index aeeb486..8ecfee8 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_2.v
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o31a cell (
+    sky130_fd_sc_hd__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o31a cell (
+    sky130_fd_sc_hd__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_4.v b/cells/o31a/sky130_fd_sc_hd__o31a_4.v
index 85923bf..5a58e72 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_4.v
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o31a cell (
+    sky130_fd_sc_hd__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o31a cell (
+    sky130_fd_sc_hd__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.v b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.v
index e56b33a..1167798 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.v
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o31ai cell (
+    sky130_fd_sc_hd__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o31ai cell (
+    sky130_fd_sc_hd__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.v b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.v
index c3506e2..ca1c56f 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.v
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o31ai cell (
+    sky130_fd_sc_hd__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o31ai cell (
+    sky130_fd_sc_hd__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.v b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.v
index dc7a372..f7e6b5a 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.v
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o31ai cell (
+    sky130_fd_sc_hd__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o31ai cell (
+    sky130_fd_sc_hd__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_1.v b/cells/o32a/sky130_fd_sc_hd__o32a_1.v
index b301664..5e820ad 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_1.v
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o32a cell (
+    sky130_fd_sc_hd__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o32a cell (
+    sky130_fd_sc_hd__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_2.v b/cells/o32a/sky130_fd_sc_hd__o32a_2.v
index b07a60e..425557f 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_2.v
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o32a cell (
+    sky130_fd_sc_hd__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o32a cell (
+    sky130_fd_sc_hd__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_4.v b/cells/o32a/sky130_fd_sc_hd__o32a_4.v
index 39c4daf..f153265 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_4.v
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o32a cell (
+    sky130_fd_sc_hd__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o32a cell (
+    sky130_fd_sc_hd__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.v b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.v
index 7ca21a7..ac4c2fe 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.v
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o32ai cell (
+    sky130_fd_sc_hd__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o32ai cell (
+    sky130_fd_sc_hd__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.v b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.v
index 889a412..59083cd 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.v
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o32ai cell (
+    sky130_fd_sc_hd__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o32ai cell (
+    sky130_fd_sc_hd__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.v b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.v
index e950c14..7ef391a 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.v
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o32ai cell (
+    sky130_fd_sc_hd__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o32ai cell (
+    sky130_fd_sc_hd__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_1.v b/cells/o41a/sky130_fd_sc_hd__o41a_1.v
index e2e3e7f..57d9df0 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_1.v
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o41a cell (
+    sky130_fd_sc_hd__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o41a cell (
+    sky130_fd_sc_hd__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_2.v b/cells/o41a/sky130_fd_sc_hd__o41a_2.v
index a41b83f..b295709 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_2.v
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o41a cell (
+    sky130_fd_sc_hd__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o41a cell (
+    sky130_fd_sc_hd__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_4.v b/cells/o41a/sky130_fd_sc_hd__o41a_4.v
index a5569a5..5651630 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_4.v
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o41a cell (
+    sky130_fd_sc_hd__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o41a cell (
+    sky130_fd_sc_hd__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.v b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.v
index b8fa4fd..49ad013 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.v
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o41ai cell (
+    sky130_fd_sc_hd__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o41ai cell (
+    sky130_fd_sc_hd__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.v b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.v
index d51416a..0af25ab 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.v
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o41ai cell (
+    sky130_fd_sc_hd__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o41ai cell (
+    sky130_fd_sc_hd__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.v b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.v
index fc2248b..c75c8f5 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.v
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__o41ai cell (
+    sky130_fd_sc_hd__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__o41ai cell (
+    sky130_fd_sc_hd__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/or2/sky130_fd_sc_hd__or2_0.v b/cells/or2/sky130_fd_sc_hd__or2_0.v
index 114ee27..edb40c7 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_0.v
+++ b/cells/or2/sky130_fd_sc_hd__or2_0.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or2 cell (
+    sky130_fd_sc_hd__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or2 cell (
+    sky130_fd_sc_hd__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hd__or2_1.v b/cells/or2/sky130_fd_sc_hd__or2_1.v
index e35f1d0..452b373 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_1.v
+++ b/cells/or2/sky130_fd_sc_hd__or2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or2 cell (
+    sky130_fd_sc_hd__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or2 cell (
+    sky130_fd_sc_hd__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hd__or2_2.v b/cells/or2/sky130_fd_sc_hd__or2_2.v
index 0908c9c..96dd802 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_2.v
+++ b/cells/or2/sky130_fd_sc_hd__or2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or2 cell (
+    sky130_fd_sc_hd__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or2 cell (
+    sky130_fd_sc_hd__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_hd__or2_4.v b/cells/or2/sky130_fd_sc_hd__or2_4.v
index 201ad35..a3cf4d6 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_4.v
+++ b/cells/or2/sky130_fd_sc_hd__or2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or2 cell (
+    sky130_fd_sc_hd__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or2 cell (
+    sky130_fd_sc_hd__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_1.v b/cells/or2b/sky130_fd_sc_hd__or2b_1.v
index 55fce6e..aa7d175 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_1.v
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or2b cell (
+    sky130_fd_sc_hd__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or2b cell (
+    sky130_fd_sc_hd__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_2.v b/cells/or2b/sky130_fd_sc_hd__or2b_2.v
index edd4340..d37bbbc 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_2.v
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or2b cell (
+    sky130_fd_sc_hd__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or2b cell (
+    sky130_fd_sc_hd__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_4.v b/cells/or2b/sky130_fd_sc_hd__or2b_4.v
index 05c64b9..4ffa8d3 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_4.v
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or2b cell (
+    sky130_fd_sc_hd__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or2b cell (
+    sky130_fd_sc_hd__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or3/sky130_fd_sc_hd__or3_1.v b/cells/or3/sky130_fd_sc_hd__or3_1.v
index 82a88a2..29fe6c0 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_1.v
+++ b/cells/or3/sky130_fd_sc_hd__or3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or3 cell (
+    sky130_fd_sc_hd__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or3 cell (
+    sky130_fd_sc_hd__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_hd__or3_2.v b/cells/or3/sky130_fd_sc_hd__or3_2.v
index a9221f6..5605fd8 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_2.v
+++ b/cells/or3/sky130_fd_sc_hd__or3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or3 cell (
+    sky130_fd_sc_hd__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or3 cell (
+    sky130_fd_sc_hd__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_hd__or3_4.v b/cells/or3/sky130_fd_sc_hd__or3_4.v
index 6cb8f89..a9ea6ae 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_4.v
+++ b/cells/or3/sky130_fd_sc_hd__or3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or3 cell (
+    sky130_fd_sc_hd__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or3 cell (
+    sky130_fd_sc_hd__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_1.v b/cells/or3b/sky130_fd_sc_hd__or3b_1.v
index ccfedfe..2205f37 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_1.v
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or3b cell (
+    sky130_fd_sc_hd__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or3b cell (
+    sky130_fd_sc_hd__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_2.v b/cells/or3b/sky130_fd_sc_hd__or3b_2.v
index 135998f..d482985 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_2.v
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or3b cell (
+    sky130_fd_sc_hd__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or3b cell (
+    sky130_fd_sc_hd__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_4.v b/cells/or3b/sky130_fd_sc_hd__or3b_4.v
index 53cc152..84ecf8c 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_4.v
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or3b cell (
+    sky130_fd_sc_hd__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or3b cell (
+    sky130_fd_sc_hd__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hd__or4_1.v b/cells/or4/sky130_fd_sc_hd__or4_1.v
index 16f8880..0549d82 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_1.v
+++ b/cells/or4/sky130_fd_sc_hd__or4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4 cell (
+    sky130_fd_sc_hd__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4 cell (
+    sky130_fd_sc_hd__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hd__or4_2.v b/cells/or4/sky130_fd_sc_hd__or4_2.v
index 408f385..4d03f54 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_2.v
+++ b/cells/or4/sky130_fd_sc_hd__or4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4 cell (
+    sky130_fd_sc_hd__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4 cell (
+    sky130_fd_sc_hd__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_hd__or4_4.v b/cells/or4/sky130_fd_sc_hd__or4_4.v
index 9a9919a..9d437e7 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_4.v
+++ b/cells/or4/sky130_fd_sc_hd__or4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4 cell (
+    sky130_fd_sc_hd__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4 cell (
+    sky130_fd_sc_hd__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_1.v b/cells/or4b/sky130_fd_sc_hd__or4b_1.v
index e4a10f3..fbb8a2c 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_1.v
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4b cell (
+    sky130_fd_sc_hd__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4b cell (
+    sky130_fd_sc_hd__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_2.v b/cells/or4b/sky130_fd_sc_hd__or4b_2.v
index 7f6eba1..35c46f8 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_2.v
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4b cell (
+    sky130_fd_sc_hd__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4b cell (
+    sky130_fd_sc_hd__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_4.v b/cells/or4b/sky130_fd_sc_hd__or4b_4.v
index 2b3af07..c38b46d 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_4.v
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4b cell (
+    sky130_fd_sc_hd__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4b cell (
+    sky130_fd_sc_hd__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.v b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.v
index ff7186a..b4f6cf9 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.v
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4bb cell (
+    sky130_fd_sc_hd__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4bb cell (
+    sky130_fd_sc_hd__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.v b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.v
index e3996a3..0d5c2c6 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.v
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4bb cell (
+    sky130_fd_sc_hd__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4bb cell (
+    sky130_fd_sc_hd__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.v b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.v
index c98ae9f..503a651 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.v
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__or4bb cell (
+    sky130_fd_sc_hd__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__or4bb cell (
+    sky130_fd_sc_hd__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.v b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.v
index 676915a..e479bef 100644
--- a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.v
+++ b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.v
@@ -51,7 +51,7 @@
     input  VNB ;
     input  VPB ;
     input  VPWR;
-    sky130_fd_sc_hd__probe_p cell (
+    sky130_fd_sc_hd__probe_p base (
         .X(X),
         .A(A),
         .VGND(VGND),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply1 VPWR;
 
-    sky130_fd_sc_hd__probe_p cell (
+    sky130_fd_sc_hd__probe_p base (
         .X(X),
         .A(A)
     );
diff --git a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.v b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.v
index 634e15e..27bbde7 100644
--- a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.v
+++ b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.v
@@ -51,7 +51,7 @@
     input  VNB ;
     input  VPB ;
     input  VPWR;
-    sky130_fd_sc_hd__probec_p cell (
+    sky130_fd_sc_hd__probec_p base (
         .X(X),
         .A(A),
         .VGND(VGND),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply1 VPWR;
 
-    sky130_fd_sc_hd__probec_p cell (
+    sky130_fd_sc_hd__probec_p base (
         .X(X),
         .A(A)
     );
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.v b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.v
index a03bb73..48c728c 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.v
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfbbn cell (
+    sky130_fd_sc_hd__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfbbn cell (
+    sky130_fd_sc_hd__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.v b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.v
index b9fddf9..d59873e 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.v
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfbbn cell (
+    sky130_fd_sc_hd__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfbbn cell (
+    sky130_fd_sc_hd__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.v b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.v
index 24bff46..87ef73d 100644
--- a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.v
+++ b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfbbp cell (
+    sky130_fd_sc_hd__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfbbp cell (
+    sky130_fd_sc_hd__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.v b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.v
index a30473d..adc1e38 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.v
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfrbp cell (
+    sky130_fd_sc_hd__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfrbp cell (
+    sky130_fd_sc_hd__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.v b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.v
index bb94321..6e0bc01 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.v
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfrbp cell (
+    sky130_fd_sc_hd__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfrbp cell (
+    sky130_fd_sc_hd__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.v b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.v
index 06f6f29..9746c74 100644
--- a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.v
+++ b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfrtn cell (
+    sky130_fd_sc_hd__sdfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfrtn cell (
+    sky130_fd_sc_hd__sdfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.v b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.v
index b3a9e18..f9e0763 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.v
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfrtp cell (
+    sky130_fd_sc_hd__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfrtp cell (
+    sky130_fd_sc_hd__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.v b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.v
index adcde35..62be756 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.v
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfrtp cell (
+    sky130_fd_sc_hd__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfrtp cell (
+    sky130_fd_sc_hd__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.v b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.v
index e415774..da592f2 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.v
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hd__sdfrtp cell (
+    sky130_fd_sc_hd__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfrtp cell (
+    sky130_fd_sc_hd__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.v b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.v
index dcabeb9..56e82af 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.v
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__sdfsbp cell (
+    sky130_fd_sc_hd__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfsbp cell (
+    sky130_fd_sc_hd__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.v b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.v
index ae11401..2278152 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.v
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__sdfsbp cell (
+    sky130_fd_sc_hd__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfsbp cell (
+    sky130_fd_sc_hd__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.v b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.v
index ef4d0bf..bf909d1 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.v
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__sdfstp cell (
+    sky130_fd_sc_hd__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfstp cell (
+    sky130_fd_sc_hd__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.v b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.v
index 6158daf..9d7063d 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.v
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__sdfstp cell (
+    sky130_fd_sc_hd__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfstp cell (
+    sky130_fd_sc_hd__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.v b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.v
index 1d4b2eb..25352be 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.v
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hd__sdfstp cell (
+    sky130_fd_sc_hd__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfstp cell (
+    sky130_fd_sc_hd__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.v b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.v
index 98b6368..ee93485 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.v
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sdfxbp cell (
+    sky130_fd_sc_hd__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfxbp cell (
+    sky130_fd_sc_hd__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.v b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.v
index de5e93d..c811f11 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.v
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sdfxbp cell (
+    sky130_fd_sc_hd__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfxbp cell (
+    sky130_fd_sc_hd__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.v b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.v
index febfd01..b265008 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.v
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sdfxtp cell (
+    sky130_fd_sc_hd__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfxtp cell (
+    sky130_fd_sc_hd__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.v b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.v
index 9db28b8..d521518 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.v
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sdfxtp cell (
+    sky130_fd_sc_hd__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfxtp cell (
+    sky130_fd_sc_hd__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.v b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.v
index e58e9ae..6b05226 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.v
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sdfxtp cell (
+    sky130_fd_sc_hd__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdfxtp cell (
+    sky130_fd_sc_hd__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.v b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.v
index 88baf02..ae9c167 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.v
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sdlclkp cell (
+    sky130_fd_sc_hd__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdlclkp cell (
+    sky130_fd_sc_hd__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.v b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.v
index 3399917..ace19ce 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.v
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sdlclkp cell (
+    sky130_fd_sc_hd__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdlclkp cell (
+    sky130_fd_sc_hd__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.v b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.v
index 2f5b3e5..22dd911 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.v
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sdlclkp cell (
+    sky130_fd_sc_hd__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sdlclkp cell (
+    sky130_fd_sc_hd__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.v b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.v
index d4b87fc..3f97d88 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.v
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sedfxbp cell (
+    sky130_fd_sc_hd__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sedfxbp cell (
+    sky130_fd_sc_hd__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.v b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.v
index c8b96ee..36d39a5 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.v
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sedfxbp cell (
+    sky130_fd_sc_hd__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sedfxbp cell (
+    sky130_fd_sc_hd__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.v b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.v
index 4f9b18b..480b41a 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.v
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sedfxtp cell (
+    sky130_fd_sc_hd__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sedfxtp cell (
+    sky130_fd_sc_hd__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.v b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.v
index f740255..39188ec 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.v
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sedfxtp cell (
+    sky130_fd_sc_hd__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sedfxtp cell (
+    sky130_fd_sc_hd__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.v b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.v
index beba5e4..fe856f9 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.v
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__sedfxtp cell (
+    sky130_fd_sc_hd__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__sedfxtp cell (
+    sky130_fd_sc_hd__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/tap/sky130_fd_sc_hd__tap_1.v b/cells/tap/sky130_fd_sc_hd__tap_1.v
index e8cee49..63c9631 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_1.v
+++ b/cells/tap/sky130_fd_sc_hd__tap_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__tap cell (
+    sky130_fd_sc_hd__tap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__tap cell ();
+    sky130_fd_sc_hd__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tap/sky130_fd_sc_hd__tap_2.v b/cells/tap/sky130_fd_sc_hd__tap_2.v
index 0aeea59..ce8d820 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_2.v
+++ b/cells/tap/sky130_fd_sc_hd__tap_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__tap cell (
+    sky130_fd_sc_hd__tap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__tap cell ();
+    sky130_fd_sc_hd__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.v b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.v
index d33bd26..1ad04be 100644
--- a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.v
+++ b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.v
@@ -48,7 +48,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__tapvgnd cell (
+    sky130_fd_sc_hd__tapvgnd base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -81,7 +81,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__tapvgnd cell ();
+    sky130_fd_sc_hd__tapvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.v b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.v
index 524207e..bd0fbce 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.v
+++ b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.v
@@ -48,7 +48,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__tapvgnd2 cell (
+    sky130_fd_sc_hd__tapvgnd2 base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -81,7 +81,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__tapvgnd2 cell ();
+    sky130_fd_sc_hd__tapvgnd2 base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.v b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.v
index 935da02..30b697e 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hd__tapvpwrvgnd cell (
+    sky130_fd_sc_hd__tapvpwrvgnd base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__tapvpwrvgnd cell ();
+    sky130_fd_sc_hd__tapvpwrvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.v b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.v
index 82b0f7f..98d228c 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.v
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xnor2 cell (
+    sky130_fd_sc_hd__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xnor2 cell (
+    sky130_fd_sc_hd__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.v b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.v
index 9953101..0f7ed6d 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.v
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xnor2 cell (
+    sky130_fd_sc_hd__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xnor2 cell (
+    sky130_fd_sc_hd__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.v b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.v
index f05140b..3eab0d0 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.v
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xnor2 cell (
+    sky130_fd_sc_hd__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xnor2 cell (
+    sky130_fd_sc_hd__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.v b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.v
index b235b19..ef91a2e 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.v
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xnor3 cell (
+    sky130_fd_sc_hd__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xnor3 cell (
+    sky130_fd_sc_hd__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.v b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.v
index 2935f38..c09a496 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.v
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xnor3 cell (
+    sky130_fd_sc_hd__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xnor3 cell (
+    sky130_fd_sc_hd__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.v b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.v
index 46f7517..81a649f 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.v
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xnor3 cell (
+    sky130_fd_sc_hd__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xnor3 cell (
+    sky130_fd_sc_hd__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_1.v b/cells/xor2/sky130_fd_sc_hd__xor2_1.v
index 9c2dcf1..19e7bd7 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_1.v
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xor2 cell (
+    sky130_fd_sc_hd__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xor2 cell (
+    sky130_fd_sc_hd__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_2.v b/cells/xor2/sky130_fd_sc_hd__xor2_2.v
index 65b6304..a98a18b 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_2.v
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xor2 cell (
+    sky130_fd_sc_hd__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xor2 cell (
+    sky130_fd_sc_hd__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_4.v b/cells/xor2/sky130_fd_sc_hd__xor2_4.v
index fa51fae..8bdca68 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_4.v
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xor2 cell (
+    sky130_fd_sc_hd__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xor2 cell (
+    sky130_fd_sc_hd__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_1.v b/cells/xor3/sky130_fd_sc_hd__xor3_1.v
index 5924514..a5646f1 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_1.v
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xor3 cell (
+    sky130_fd_sc_hd__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xor3 cell (
+    sky130_fd_sc_hd__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_2.v b/cells/xor3/sky130_fd_sc_hd__xor3_2.v
index 45328b7..2a47bcf 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_2.v
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xor3 cell (
+    sky130_fd_sc_hd__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xor3 cell (
+    sky130_fd_sc_hd__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_4.v b/cells/xor3/sky130_fd_sc_hd__xor3_4.v
index 5a9d5e5..8c37780 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_4.v
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hd__xor3 cell (
+    sky130_fd_sc_hd__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hd__xor3 cell (
+    sky130_fd_sc_hd__xor3 base (
         .X(X),
         .A(A),
         .B(B),