diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.v b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.v
index cfaf501..876ae7f 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.v
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2111o cell (
+    sky130_fd_sc_ls__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2111o cell (
+    sky130_fd_sc_ls__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.v b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.v
index b455b9f..f39befb 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.v
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2111o cell (
+    sky130_fd_sc_ls__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2111o cell (
+    sky130_fd_sc_ls__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.v b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.v
index 5da9b3c..46093bb 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.v
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2111o cell (
+    sky130_fd_sc_ls__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2111o cell (
+    sky130_fd_sc_ls__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.v b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.v
index 7856f2d..ac8a813 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.v
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2111oi cell (
+    sky130_fd_sc_ls__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2111oi cell (
+    sky130_fd_sc_ls__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.v b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.v
index 7134e12..584b28d 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.v
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2111oi cell (
+    sky130_fd_sc_ls__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2111oi cell (
+    sky130_fd_sc_ls__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.v b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.v
index c3f1178..1bd9773 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.v
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2111oi cell (
+    sky130_fd_sc_ls__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2111oi cell (
+    sky130_fd_sc_ls__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_1.v b/cells/a211o/sky130_fd_sc_ls__a211o_1.v
index 8a17839..9a40781 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_1.v
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a211o cell (
+    sky130_fd_sc_ls__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a211o cell (
+    sky130_fd_sc_ls__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_2.v b/cells/a211o/sky130_fd_sc_ls__a211o_2.v
index 183b21d..1263e19 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_2.v
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a211o cell (
+    sky130_fd_sc_ls__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a211o cell (
+    sky130_fd_sc_ls__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_4.v b/cells/a211o/sky130_fd_sc_ls__a211o_4.v
index 452309b..d2b3bdf 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_4.v
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a211o cell (
+    sky130_fd_sc_ls__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a211o cell (
+    sky130_fd_sc_ls__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.v b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.v
index f7d59a7..45513f0 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.v
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a211oi cell (
+    sky130_fd_sc_ls__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a211oi cell (
+    sky130_fd_sc_ls__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.v b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.v
index fc1a15e..8aa2b8d 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.v
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a211oi cell (
+    sky130_fd_sc_ls__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a211oi cell (
+    sky130_fd_sc_ls__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.v b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.v
index 63ff191..67a0d46 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.v
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a211oi cell (
+    sky130_fd_sc_ls__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a211oi cell (
+    sky130_fd_sc_ls__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.v b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.v
index d84d4a0..968bc02 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.v
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21bo cell (
+    sky130_fd_sc_ls__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21bo cell (
+    sky130_fd_sc_ls__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.v b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.v
index 0a3eaba..4c48d2d 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.v
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21bo cell (
+    sky130_fd_sc_ls__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21bo cell (
+    sky130_fd_sc_ls__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.v b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.v
index 36dfbad..65925bd 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.v
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21bo cell (
+    sky130_fd_sc_ls__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21bo cell (
+    sky130_fd_sc_ls__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.v b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.v
index d9723f5..e92e129 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.v
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21boi cell (
+    sky130_fd_sc_ls__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21boi cell (
+    sky130_fd_sc_ls__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.v b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.v
index 2b5c4a0..5c5279f 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.v
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21boi cell (
+    sky130_fd_sc_ls__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21boi cell (
+    sky130_fd_sc_ls__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.v b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.v
index 034683c..21dd22d 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.v
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21boi cell (
+    sky130_fd_sc_ls__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21boi cell (
+    sky130_fd_sc_ls__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_1.v b/cells/a21o/sky130_fd_sc_ls__a21o_1.v
index 5b30fe3..b5e5f2e 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_1.v
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21o cell (
+    sky130_fd_sc_ls__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21o cell (
+    sky130_fd_sc_ls__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_2.v b/cells/a21o/sky130_fd_sc_ls__a21o_2.v
index 46db38c..28c5667 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_2.v
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21o cell (
+    sky130_fd_sc_ls__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21o cell (
+    sky130_fd_sc_ls__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_4.v b/cells/a21o/sky130_fd_sc_ls__a21o_4.v
index 8206649..dd9daee 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_4.v
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21o cell (
+    sky130_fd_sc_ls__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21o cell (
+    sky130_fd_sc_ls__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.v b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.v
index 6994784..00ab275 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.v
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21oi cell (
+    sky130_fd_sc_ls__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21oi cell (
+    sky130_fd_sc_ls__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.v b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.v
index 6439b7a..05a5425 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.v
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21oi cell (
+    sky130_fd_sc_ls__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21oi cell (
+    sky130_fd_sc_ls__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.v b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.v
index 8374135..4ff61bf 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.v
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a21oi cell (
+    sky130_fd_sc_ls__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a21oi cell (
+    sky130_fd_sc_ls__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_1.v b/cells/a221o/sky130_fd_sc_ls__a221o_1.v
index b519327..7fd3a4d 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_1.v
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a221o cell (
+    sky130_fd_sc_ls__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a221o cell (
+    sky130_fd_sc_ls__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_2.v b/cells/a221o/sky130_fd_sc_ls__a221o_2.v
index 6bd65fc..e987799 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_2.v
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a221o cell (
+    sky130_fd_sc_ls__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a221o cell (
+    sky130_fd_sc_ls__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_4.v b/cells/a221o/sky130_fd_sc_ls__a221o_4.v
index 1aa7411..7a0cc85 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_4.v
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a221o cell (
+    sky130_fd_sc_ls__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a221o cell (
+    sky130_fd_sc_ls__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.v b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.v
index cd0a1b8..4ee63ca 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.v
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a221oi cell (
+    sky130_fd_sc_ls__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a221oi cell (
+    sky130_fd_sc_ls__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.v b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.v
index b9f3b27..d68811c 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.v
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a221oi cell (
+    sky130_fd_sc_ls__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a221oi cell (
+    sky130_fd_sc_ls__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.v b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.v
index 02091f2..dc88189 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.v
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a221oi cell (
+    sky130_fd_sc_ls__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a221oi cell (
+    sky130_fd_sc_ls__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_1.v b/cells/a222o/sky130_fd_sc_ls__a222o_1.v
index 65d2239..42a79e3 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_1.v
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_1.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a222o cell (
+    sky130_fd_sc_ls__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a222o cell (
+    sky130_fd_sc_ls__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_2.v b/cells/a222o/sky130_fd_sc_ls__a222o_2.v
index f6a1e07..6025ad0 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_2.v
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_2.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a222o cell (
+    sky130_fd_sc_ls__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a222o cell (
+    sky130_fd_sc_ls__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.v b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.v
index ac12c37..2a4b02b 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.v
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a222oi cell (
+    sky130_fd_sc_ls__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a222oi cell (
+    sky130_fd_sc_ls__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.v b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.v
index e9417bb..5fc56b4 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.v
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a222oi cell (
+    sky130_fd_sc_ls__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a222oi cell (
+    sky130_fd_sc_ls__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_1.v b/cells/a22o/sky130_fd_sc_ls__a22o_1.v
index 313ff00..cc1ddcd 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_1.v
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a22o cell (
+    sky130_fd_sc_ls__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a22o cell (
+    sky130_fd_sc_ls__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_2.v b/cells/a22o/sky130_fd_sc_ls__a22o_2.v
index 37c37dd..7f5a287 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_2.v
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a22o cell (
+    sky130_fd_sc_ls__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a22o cell (
+    sky130_fd_sc_ls__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_4.v b/cells/a22o/sky130_fd_sc_ls__a22o_4.v
index db843cf..671c4d2 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_4.v
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a22o cell (
+    sky130_fd_sc_ls__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a22o cell (
+    sky130_fd_sc_ls__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.v b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.v
index 6417675..28f44e8 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.v
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a22oi cell (
+    sky130_fd_sc_ls__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a22oi cell (
+    sky130_fd_sc_ls__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.v b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.v
index 1b82219..ff93008 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.v
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a22oi cell (
+    sky130_fd_sc_ls__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a22oi cell (
+    sky130_fd_sc_ls__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.v b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.v
index ac5c1e0..9eab3b5 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.v
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a22oi cell (
+    sky130_fd_sc_ls__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a22oi cell (
+    sky130_fd_sc_ls__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.v b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.v
index 79a1385..77f7a1d 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.v
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2bb2o cell (
+    sky130_fd_sc_ls__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2bb2o cell (
+    sky130_fd_sc_ls__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.v b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.v
index 8ba1265..531d225 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.v
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2bb2o cell (
+    sky130_fd_sc_ls__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2bb2o cell (
+    sky130_fd_sc_ls__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.v b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.v
index 79b792a..aae8471 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.v
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2bb2o cell (
+    sky130_fd_sc_ls__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2bb2o cell (
+    sky130_fd_sc_ls__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.v b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.v
index 12b09c8..0115fc6 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.v
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2bb2oi cell (
+    sky130_fd_sc_ls__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2bb2oi cell (
+    sky130_fd_sc_ls__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.v b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.v
index 733dd78..b327155 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.v
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2bb2oi cell (
+    sky130_fd_sc_ls__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2bb2oi cell (
+    sky130_fd_sc_ls__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.v b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.v
index 2b7f20c..1a7f426 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.v
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a2bb2oi cell (
+    sky130_fd_sc_ls__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a2bb2oi cell (
+    sky130_fd_sc_ls__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_1.v b/cells/a311o/sky130_fd_sc_ls__a311o_1.v
index 424d672..bfc036e 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_1.v
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a311o cell (
+    sky130_fd_sc_ls__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a311o cell (
+    sky130_fd_sc_ls__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_2.v b/cells/a311o/sky130_fd_sc_ls__a311o_2.v
index 20794b2..4b52199 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_2.v
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a311o cell (
+    sky130_fd_sc_ls__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a311o cell (
+    sky130_fd_sc_ls__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_4.v b/cells/a311o/sky130_fd_sc_ls__a311o_4.v
index 041d43e..eafb9ba 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_4.v
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a311o cell (
+    sky130_fd_sc_ls__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a311o cell (
+    sky130_fd_sc_ls__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.v b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.v
index a66b28e..ea5d6ec 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.v
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a311oi cell (
+    sky130_fd_sc_ls__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a311oi cell (
+    sky130_fd_sc_ls__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.v b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.v
index 28b991a..ebeadd7 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.v
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a311oi cell (
+    sky130_fd_sc_ls__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a311oi cell (
+    sky130_fd_sc_ls__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.v b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.v
index 3416bc6..b18cbc4 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.v
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a311oi cell (
+    sky130_fd_sc_ls__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a311oi cell (
+    sky130_fd_sc_ls__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_1.v b/cells/a31o/sky130_fd_sc_ls__a31o_1.v
index 44d6e97..9414126 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_1.v
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a31o cell (
+    sky130_fd_sc_ls__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a31o cell (
+    sky130_fd_sc_ls__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_2.v b/cells/a31o/sky130_fd_sc_ls__a31o_2.v
index f2f374b..6717983 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_2.v
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a31o cell (
+    sky130_fd_sc_ls__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a31o cell (
+    sky130_fd_sc_ls__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_4.v b/cells/a31o/sky130_fd_sc_ls__a31o_4.v
index cb2adeb..ec27239 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_4.v
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a31o cell (
+    sky130_fd_sc_ls__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a31o cell (
+    sky130_fd_sc_ls__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.v b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.v
index 5286d75..3ee1118 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.v
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a31oi cell (
+    sky130_fd_sc_ls__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a31oi cell (
+    sky130_fd_sc_ls__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.v b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.v
index 1df617a..f7c95e0 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.v
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a31oi cell (
+    sky130_fd_sc_ls__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a31oi cell (
+    sky130_fd_sc_ls__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.v b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.v
index 5bd1aa0..a4e5316 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.v
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a31oi cell (
+    sky130_fd_sc_ls__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a31oi cell (
+    sky130_fd_sc_ls__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_1.v b/cells/a32o/sky130_fd_sc_ls__a32o_1.v
index 91670f0..662764b 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_1.v
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a32o cell (
+    sky130_fd_sc_ls__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a32o cell (
+    sky130_fd_sc_ls__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_2.v b/cells/a32o/sky130_fd_sc_ls__a32o_2.v
index 0a71894..8e81ee0 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_2.v
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a32o cell (
+    sky130_fd_sc_ls__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a32o cell (
+    sky130_fd_sc_ls__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_4.v b/cells/a32o/sky130_fd_sc_ls__a32o_4.v
index 16e6779..547f572 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_4.v
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a32o cell (
+    sky130_fd_sc_ls__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a32o cell (
+    sky130_fd_sc_ls__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.v b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.v
index 292f5d8..cac22ce 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.v
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a32oi cell (
+    sky130_fd_sc_ls__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a32oi cell (
+    sky130_fd_sc_ls__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.v b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.v
index fdf64e0..7da5d5c 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.v
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a32oi cell (
+    sky130_fd_sc_ls__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a32oi cell (
+    sky130_fd_sc_ls__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.v b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.v
index eafb81b..0455e0f 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.v
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a32oi cell (
+    sky130_fd_sc_ls__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a32oi cell (
+    sky130_fd_sc_ls__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_1.v b/cells/a41o/sky130_fd_sc_ls__a41o_1.v
index 6d738f5..9489846 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_1.v
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a41o cell (
+    sky130_fd_sc_ls__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a41o cell (
+    sky130_fd_sc_ls__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_2.v b/cells/a41o/sky130_fd_sc_ls__a41o_2.v
index 6e4c420..fc39935 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_2.v
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a41o cell (
+    sky130_fd_sc_ls__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a41o cell (
+    sky130_fd_sc_ls__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_4.v b/cells/a41o/sky130_fd_sc_ls__a41o_4.v
index 030322c..2bb5fae 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_4.v
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a41o cell (
+    sky130_fd_sc_ls__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a41o cell (
+    sky130_fd_sc_ls__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.v b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.v
index 4c8c332..eb765ad 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.v
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a41oi cell (
+    sky130_fd_sc_ls__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a41oi cell (
+    sky130_fd_sc_ls__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.v b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.v
index e25a80a..8a5cbed 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.v
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a41oi cell (
+    sky130_fd_sc_ls__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a41oi cell (
+    sky130_fd_sc_ls__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.v b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.v
index 00ea464..51a4b4d 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.v
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__a41oi cell (
+    sky130_fd_sc_ls__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__a41oi cell (
+    sky130_fd_sc_ls__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/and2/sky130_fd_sc_ls__and2_1.v b/cells/and2/sky130_fd_sc_ls__and2_1.v
index a9dab2c..baf33e1 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_1.v
+++ b/cells/and2/sky130_fd_sc_ls__and2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and2 cell (
+    sky130_fd_sc_ls__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and2 cell (
+    sky130_fd_sc_ls__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_ls__and2_2.v b/cells/and2/sky130_fd_sc_ls__and2_2.v
index 91a8d83..96494c0 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_2.v
+++ b/cells/and2/sky130_fd_sc_ls__and2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and2 cell (
+    sky130_fd_sc_ls__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and2 cell (
+    sky130_fd_sc_ls__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_ls__and2_4.v b/cells/and2/sky130_fd_sc_ls__and2_4.v
index c9efcf6..09122e6 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_4.v
+++ b/cells/and2/sky130_fd_sc_ls__and2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and2 cell (
+    sky130_fd_sc_ls__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and2 cell (
+    sky130_fd_sc_ls__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_1.v b/cells/and2b/sky130_fd_sc_ls__and2b_1.v
index 01b537c..2cc7089 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_1.v
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and2b cell (
+    sky130_fd_sc_ls__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and2b cell (
+    sky130_fd_sc_ls__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_2.v b/cells/and2b/sky130_fd_sc_ls__and2b_2.v
index 3bb1d31..7ff60e7 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_2.v
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and2b cell (
+    sky130_fd_sc_ls__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and2b cell (
+    sky130_fd_sc_ls__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_4.v b/cells/and2b/sky130_fd_sc_ls__and2b_4.v
index 30e6bf0..e45f064 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_4.v
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and2b cell (
+    sky130_fd_sc_ls__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and2b cell (
+    sky130_fd_sc_ls__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and3/sky130_fd_sc_ls__and3_1.v b/cells/and3/sky130_fd_sc_ls__and3_1.v
index af45b83..12f0ded 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_1.v
+++ b/cells/and3/sky130_fd_sc_ls__and3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and3 cell (
+    sky130_fd_sc_ls__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and3 cell (
+    sky130_fd_sc_ls__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_ls__and3_2.v b/cells/and3/sky130_fd_sc_ls__and3_2.v
index c3e8dbb..f26fedd 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_2.v
+++ b/cells/and3/sky130_fd_sc_ls__and3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and3 cell (
+    sky130_fd_sc_ls__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and3 cell (
+    sky130_fd_sc_ls__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_ls__and3_4.v b/cells/and3/sky130_fd_sc_ls__and3_4.v
index d558694..372eb94 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_4.v
+++ b/cells/and3/sky130_fd_sc_ls__and3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and3 cell (
+    sky130_fd_sc_ls__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and3 cell (
+    sky130_fd_sc_ls__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_1.v b/cells/and3b/sky130_fd_sc_ls__and3b_1.v
index 025f701..5fa9550 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_1.v
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and3b cell (
+    sky130_fd_sc_ls__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and3b cell (
+    sky130_fd_sc_ls__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_2.v b/cells/and3b/sky130_fd_sc_ls__and3b_2.v
index 40b78fe..84e651d 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_2.v
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and3b cell (
+    sky130_fd_sc_ls__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and3b cell (
+    sky130_fd_sc_ls__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_4.v b/cells/and3b/sky130_fd_sc_ls__and3b_4.v
index 353a695..a548297 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_4.v
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and3b cell (
+    sky130_fd_sc_ls__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and3b cell (
+    sky130_fd_sc_ls__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_ls__and4_1.v b/cells/and4/sky130_fd_sc_ls__and4_1.v
index c9ed7ae..77570b4 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_1.v
+++ b/cells/and4/sky130_fd_sc_ls__and4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4 cell (
+    sky130_fd_sc_ls__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4 cell (
+    sky130_fd_sc_ls__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_ls__and4_2.v b/cells/and4/sky130_fd_sc_ls__and4_2.v
index fc5fb66..7aded11 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_2.v
+++ b/cells/and4/sky130_fd_sc_ls__and4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4 cell (
+    sky130_fd_sc_ls__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4 cell (
+    sky130_fd_sc_ls__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_ls__and4_4.v b/cells/and4/sky130_fd_sc_ls__and4_4.v
index 5de4752..0e4c223 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_4.v
+++ b/cells/and4/sky130_fd_sc_ls__and4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4 cell (
+    sky130_fd_sc_ls__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4 cell (
+    sky130_fd_sc_ls__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_1.v b/cells/and4b/sky130_fd_sc_ls__and4b_1.v
index 571fa62..6e86be8 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_1.v
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4b cell (
+    sky130_fd_sc_ls__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4b cell (
+    sky130_fd_sc_ls__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_2.v b/cells/and4b/sky130_fd_sc_ls__and4b_2.v
index ae3dfe4..257cbbd 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_2.v
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4b cell (
+    sky130_fd_sc_ls__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4b cell (
+    sky130_fd_sc_ls__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_4.v b/cells/and4b/sky130_fd_sc_ls__and4b_4.v
index d8dd3df..6403a70 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_4.v
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4b cell (
+    sky130_fd_sc_ls__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4b cell (
+    sky130_fd_sc_ls__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.v b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.v
index 15d56b7..9518fed 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.v
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4bb cell (
+    sky130_fd_sc_ls__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4bb cell (
+    sky130_fd_sc_ls__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.v b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.v
index e2f1279..ead8220 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.v
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4bb cell (
+    sky130_fd_sc_ls__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4bb cell (
+    sky130_fd_sc_ls__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.v b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.v
index 6d0de15..a6dd242 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.v
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__and4bb cell (
+    sky130_fd_sc_ls__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__and4bb cell (
+    sky130_fd_sc_ls__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/buf/sky130_fd_sc_ls__buf_1.v b/cells/buf/sky130_fd_sc_ls__buf_1.v
index 656b0ec..ca1e61f 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_1.v
+++ b/cells/buf/sky130_fd_sc_ls__buf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_ls__buf_16.v b/cells/buf/sky130_fd_sc_ls__buf_16.v
index 4f8984e..b2ecc92 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_16.v
+++ b/cells/buf/sky130_fd_sc_ls__buf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_ls__buf_2.v b/cells/buf/sky130_fd_sc_ls__buf_2.v
index 2722579..b7495a2 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_2.v
+++ b/cells/buf/sky130_fd_sc_ls__buf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_ls__buf_4.v b/cells/buf/sky130_fd_sc_ls__buf_4.v
index 4688621..85e7338 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_4.v
+++ b/cells/buf/sky130_fd_sc_ls__buf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_ls__buf_8.v b/cells/buf/sky130_fd_sc_ls__buf_8.v
index 8d8f2ad..31261cd 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_8.v
+++ b/cells/buf/sky130_fd_sc_ls__buf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__buf cell (
+    sky130_fd_sc_ls__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.v b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.v
index 6b0c00b..4bba6b8 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.v
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__bufbuf cell (
+    sky130_fd_sc_ls__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__bufbuf cell (
+    sky130_fd_sc_ls__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.v b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.v
index 5ff713a..5c2ddaf 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.v
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__bufbuf cell (
+    sky130_fd_sc_ls__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__bufbuf cell (
+    sky130_fd_sc_ls__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.v b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.v
index 5255966..a204f49 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.v
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__bufinv cell (
+    sky130_fd_sc_ls__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__bufinv cell (
+    sky130_fd_sc_ls__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.v b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.v
index 6deaa73..6681f99 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.v
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__bufinv cell (
+    sky130_fd_sc_ls__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__bufinv cell (
+    sky130_fd_sc_ls__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.v b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.v
index cacae45..d0bb19e 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.v
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.v b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.v
index ba812ef..bf37acc 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.v
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.v b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.v
index 42f6e84..0cfeea5 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.v
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.v b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.v
index 38e4054..dc1a493 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.v
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.v b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.v
index 452997a..570de54 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.v
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkbuf cell (
+    sky130_fd_sc_ls__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.v b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.v
index ddadf3c..b5895b0 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.v
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkdlyinv3sd1 cell (
+    sky130_fd_sc_ls__clkdlyinv3sd1 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkdlyinv3sd1 cell (
+    sky130_fd_sc_ls__clkdlyinv3sd1 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.v b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.v
index 4923486..d120c15 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.v
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkdlyinv3sd2 cell (
+    sky130_fd_sc_ls__clkdlyinv3sd2 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkdlyinv3sd2 cell (
+    sky130_fd_sc_ls__clkdlyinv3sd2 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.v b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.v
index aa8b7cd..b100228 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.v
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkdlyinv3sd3 cell (
+    sky130_fd_sc_ls__clkdlyinv3sd3 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkdlyinv3sd3 cell (
+    sky130_fd_sc_ls__clkdlyinv3sd3 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.v b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.v
index d37abfc..f322a70 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.v
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkdlyinv5sd1 cell (
+    sky130_fd_sc_ls__clkdlyinv5sd1 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkdlyinv5sd1 cell (
+    sky130_fd_sc_ls__clkdlyinv5sd1 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.v b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.v
index 06143f5..abeaedd 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.v
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkdlyinv5sd2 cell (
+    sky130_fd_sc_ls__clkdlyinv5sd2 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkdlyinv5sd2 cell (
+    sky130_fd_sc_ls__clkdlyinv5sd2 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.v b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.v
index 4f26944..b7de4bd 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.v
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkdlyinv5sd3 cell (
+    sky130_fd_sc_ls__clkdlyinv5sd3 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkdlyinv5sd3 cell (
+    sky130_fd_sc_ls__clkdlyinv5sd3 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.v b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.v
index 4585452..0cdfea3 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.v
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.v b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.v
index 04b1c1f..b093ad1 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.v
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.v b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.v
index 7518d8d..17e9db4 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.v
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.v b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.v
index 4fc6f8f..eccdccc 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.v
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.v b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.v
index ec6b635..7219087 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.v
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__clkinv cell (
+    sky130_fd_sc_ls__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/conb/sky130_fd_sc_ls__conb_1.v b/cells/conb/sky130_fd_sc_ls__conb_1.v
index d777c66..44a60b4 100644
--- a/cells/conb/sky130_fd_sc_ls__conb_1.v
+++ b/cells/conb/sky130_fd_sc_ls__conb_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__conb cell (
+    sky130_fd_sc_ls__conb base (
         .HI(HI),
         .LO(LO),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__conb cell (
+    sky130_fd_sc_ls__conb base (
         .HI(HI),
         .LO(LO)
     );
diff --git a/cells/decap/sky130_fd_sc_ls__decap_4.v b/cells/decap/sky130_fd_sc_ls__decap_4.v
index 6d6ba14..9cfd665 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_4.v
+++ b/cells/decap/sky130_fd_sc_ls__decap_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__decap cell (
+    sky130_fd_sc_ls__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__decap cell ();
+    sky130_fd_sc_ls__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_ls__decap_8.v b/cells/decap/sky130_fd_sc_ls__decap_8.v
index d5a7451..ab38dfa 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_8.v
+++ b/cells/decap/sky130_fd_sc_ls__decap_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__decap cell (
+    sky130_fd_sc_ls__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__decap cell ();
+    sky130_fd_sc_ls__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.v b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.v
index 0e4fef2..c4bbba1 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.v
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__decaphe cell (
+    sky130_fd_sc_ls__decaphe base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__decaphe cell ();
+    sky130_fd_sc_ls__decaphe base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.v b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.v
index 1151dc0..8a371c2 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.v
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__decaphe cell (
+    sky130_fd_sc_ls__decaphe base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__decaphe cell ();
+    sky130_fd_sc_ls__decaphe base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.v b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.v
index 2f176a5..7580e30 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.v
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__decaphe cell (
+    sky130_fd_sc_ls__decaphe base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__decaphe cell ();
+    sky130_fd_sc_ls__decaphe base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.v b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.v
index 4157f80..96973fe 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.v
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__decaphe cell (
+    sky130_fd_sc_ls__decaphe base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__decaphe cell ();
+    sky130_fd_sc_ls__decaphe base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.v b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.v
index a3e9e58..840cb11 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.v
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__decaphe cell (
+    sky130_fd_sc_ls__decaphe base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__decaphe cell ();
+    sky130_fd_sc_ls__decaphe base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.v b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.v
index ef578be..db22aca 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.v
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__decaphe cell (
+    sky130_fd_sc_ls__decaphe base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__decaphe cell ();
+    sky130_fd_sc_ls__decaphe base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.v b/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.v
index dc8c6d4..b0f1deb 100644
--- a/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.v
+++ b/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.v
@@ -45,7 +45,7 @@
     input VPWR;
     input VGND;
     input VPB ;
-    sky130_fd_sc_ls__decaphetap cell (
+    sky130_fd_sc_ls__decaphetap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB)
@@ -74,7 +74,7 @@
     supply0 VGND;
     supply1 VPB ;
 
-    sky130_fd_sc_ls__decaphetap cell ();
+    sky130_fd_sc_ls__decaphetap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.v b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.v
index 8162bc6..8b439c2 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.v
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfbbn cell (
+    sky130_fd_sc_ls__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfbbn cell (
+    sky130_fd_sc_ls__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.v b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.v
index e9bebf8..08fb30c 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.v
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfbbn cell (
+    sky130_fd_sc_ls__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfbbn cell (
+    sky130_fd_sc_ls__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.v b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.v
index d4ba808..0dd331b 100644
--- a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.v
+++ b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfbbp cell (
+    sky130_fd_sc_ls__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfbbp cell (
+    sky130_fd_sc_ls__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.v b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.v
index 064d9f0..44af701 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.v
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfrbp cell (
+    sky130_fd_sc_ls__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfrbp cell (
+    sky130_fd_sc_ls__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.v b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.v
index 8ae5df4..b30cc4b 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.v
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfrbp cell (
+    sky130_fd_sc_ls__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfrbp cell (
+    sky130_fd_sc_ls__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.v b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.v
index c32d302..6b8cc9a 100644
--- a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.v
+++ b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfrtn cell (
+    sky130_fd_sc_ls__dfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfrtn cell (
+    sky130_fd_sc_ls__dfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.v b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.v
index 0b3b28f..0830d9c 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.v
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfrtp cell (
+    sky130_fd_sc_ls__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfrtp cell (
+    sky130_fd_sc_ls__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.v b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.v
index d195c49..1397a3a 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.v
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfrtp cell (
+    sky130_fd_sc_ls__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfrtp cell (
+    sky130_fd_sc_ls__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.v b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.v
index 6255252..b5d305a 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.v
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dfrtp cell (
+    sky130_fd_sc_ls__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfrtp cell (
+    sky130_fd_sc_ls__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.v b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.v
index d3dd1c5..7f77ca4 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.v
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__dfsbp cell (
+    sky130_fd_sc_ls__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfsbp cell (
+    sky130_fd_sc_ls__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.v b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.v
index e426c4f..8634e4b 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.v
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__dfsbp cell (
+    sky130_fd_sc_ls__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfsbp cell (
+    sky130_fd_sc_ls__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.v b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.v
index cff20b5..353a98f 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.v
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__dfstp cell (
+    sky130_fd_sc_ls__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfstp cell (
+    sky130_fd_sc_ls__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.v b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.v
index faf2cca..3985b5f 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.v
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__dfstp cell (
+    sky130_fd_sc_ls__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfstp cell (
+    sky130_fd_sc_ls__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.v b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.v
index dcd47f6..eebdd2d 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.v
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__dfstp cell (
+    sky130_fd_sc_ls__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfstp cell (
+    sky130_fd_sc_ls__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.v b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.v
index fcaaa41..72441b2 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.v
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dfxbp cell (
+    sky130_fd_sc_ls__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfxbp cell (
+    sky130_fd_sc_ls__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.v b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.v
index 465ddd4..18ea144 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.v
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dfxbp cell (
+    sky130_fd_sc_ls__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfxbp cell (
+    sky130_fd_sc_ls__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.v b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.v
index 10639da..6c98d1c 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.v
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dfxtp cell (
+    sky130_fd_sc_ls__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfxtp cell (
+    sky130_fd_sc_ls__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.v b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.v
index 76535d2..d1b56d2 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.v
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dfxtp cell (
+    sky130_fd_sc_ls__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfxtp cell (
+    sky130_fd_sc_ls__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.v b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.v
index 868767e..a4e5791 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.v
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dfxtp cell (
+    sky130_fd_sc_ls__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dfxtp cell (
+    sky130_fd_sc_ls__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/diode/sky130_fd_sc_ls__diode_2.v b/cells/diode/sky130_fd_sc_ls__diode_2.v
index 7f66e0b..e429869 100644
--- a/cells/diode/sky130_fd_sc_ls__diode_2.v
+++ b/cells/diode/sky130_fd_sc_ls__diode_2.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_ls__diode cell (
+    sky130_fd_sc_ls__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__diode cell (
+    sky130_fd_sc_ls__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.v b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.v
index b48e05b..3cb12f3 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.v
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlclkp cell (
+    sky130_fd_sc_ls__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlclkp cell (
+    sky130_fd_sc_ls__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.v b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.v
index 7933b9b..11624a2 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.v
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlclkp cell (
+    sky130_fd_sc_ls__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlclkp cell (
+    sky130_fd_sc_ls__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.v b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.v
index d5e8784..5f39bdc 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.v
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlclkp cell (
+    sky130_fd_sc_ls__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlclkp cell (
+    sky130_fd_sc_ls__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.v b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.v
index 5951f6b..5afba00 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.v
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrbn cell (
+    sky130_fd_sc_ls__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrbn cell (
+    sky130_fd_sc_ls__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.v b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.v
index e62c7f8..01eb666 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.v
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrbn cell (
+    sky130_fd_sc_ls__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrbn cell (
+    sky130_fd_sc_ls__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.v b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.v
index 2c93392..38b8537 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.v
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrbp cell (
+    sky130_fd_sc_ls__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrbp cell (
+    sky130_fd_sc_ls__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.v b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.v
index 774ae34..e11e5ef 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.v
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrbp cell (
+    sky130_fd_sc_ls__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrbp cell (
+    sky130_fd_sc_ls__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.v b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.v
index 28237ca..5a60711 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.v
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrtn cell (
+    sky130_fd_sc_ls__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrtn cell (
+    sky130_fd_sc_ls__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.v b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.v
index 8cdc68f..736ecac 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.v
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrtn cell (
+    sky130_fd_sc_ls__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrtn cell (
+    sky130_fd_sc_ls__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.v b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.v
index 96567e6..3bb3629 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.v
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrtn cell (
+    sky130_fd_sc_ls__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrtn cell (
+    sky130_fd_sc_ls__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.v b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.v
index 7e26fb0..98f989a 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.v
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrtp cell (
+    sky130_fd_sc_ls__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrtp cell (
+    sky130_fd_sc_ls__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.v b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.v
index 45d4678..5a4e87f 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.v
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrtp cell (
+    sky130_fd_sc_ls__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrtp cell (
+    sky130_fd_sc_ls__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.v b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.v
index 7f7518f..1ab7cf2 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.v
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__dlrtp cell (
+    sky130_fd_sc_ls__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlrtp cell (
+    sky130_fd_sc_ls__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.v b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.v
index 6f9b41b..56b2399 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.v
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.v
@@ -55,7 +55,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ls__dlxbn cell (
+    sky130_fd_sc_ls__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlxbn cell (
+    sky130_fd_sc_ls__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.v b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.v
index e8efdd8..a778ff5 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.v
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.v
@@ -55,7 +55,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ls__dlxbn cell (
+    sky130_fd_sc_ls__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlxbn cell (
+    sky130_fd_sc_ls__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.v b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.v
index d327303..3933091 100644
--- a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.v
+++ b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlxbp cell (
+    sky130_fd_sc_ls__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlxbp cell (
+    sky130_fd_sc_ls__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.v b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.v
index 4257294..17f19cb 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.v
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ls__dlxtn cell (
+    sky130_fd_sc_ls__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlxtn cell (
+    sky130_fd_sc_ls__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.v b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.v
index 24d6298..35ccf6e 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.v
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ls__dlxtn cell (
+    sky130_fd_sc_ls__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlxtn cell (
+    sky130_fd_sc_ls__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.v b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.v
index 0601853..ff11904 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.v
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ls__dlxtn cell (
+    sky130_fd_sc_ls__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlxtn cell (
+    sky130_fd_sc_ls__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.v b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.v
index 69b6574..5cd26de 100644
--- a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.v
+++ b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlxtp cell (
+    sky130_fd_sc_ls__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlxtp cell (
+    sky130_fd_sc_ls__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE)
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.v b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.v
index 3b35083..1449064 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlygate4sd1 cell (
+    sky130_fd_sc_ls__dlygate4sd1 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlygate4sd1 cell (
+    sky130_fd_sc_ls__dlygate4sd1 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.v b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.v
index 3b2b703..930d57c 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlygate4sd2 cell (
+    sky130_fd_sc_ls__dlygate4sd2 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlygate4sd2 cell (
+    sky130_fd_sc_ls__dlygate4sd2 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.v b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.v
index de93b64..b3a1d17 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlygate4sd3 cell (
+    sky130_fd_sc_ls__dlygate4sd3 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlygate4sd3 cell (
+    sky130_fd_sc_ls__dlygate4sd3 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.v b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.v
index 8028a27..710e966 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlymetal6s2s cell (
+    sky130_fd_sc_ls__dlymetal6s2s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlymetal6s2s cell (
+    sky130_fd_sc_ls__dlymetal6s2s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.v b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.v
index 17650e2..39ea35d 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlymetal6s4s cell (
+    sky130_fd_sc_ls__dlymetal6s4s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlymetal6s4s cell (
+    sky130_fd_sc_ls__dlymetal6s4s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.v b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.v
index 1f6ce14..8fcdbf2 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__dlymetal6s6s cell (
+    sky130_fd_sc_ls__dlymetal6s6s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__dlymetal6s6s cell (
+    sky130_fd_sc_ls__dlymetal6s6s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.v b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.v
index bf5ccec..ed523d8 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.v
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__ebufn cell (
+    sky130_fd_sc_ls__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__ebufn cell (
+    sky130_fd_sc_ls__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.v b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.v
index 587386b..70de594 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.v
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__ebufn cell (
+    sky130_fd_sc_ls__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__ebufn cell (
+    sky130_fd_sc_ls__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.v b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.v
index cc9745f..5493b57 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.v
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__ebufn cell (
+    sky130_fd_sc_ls__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__ebufn cell (
+    sky130_fd_sc_ls__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.v b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.v
index e1ac056..c7626c5 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.v
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__ebufn cell (
+    sky130_fd_sc_ls__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__ebufn cell (
+    sky130_fd_sc_ls__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.v b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.v
index 2630172..7471642 100644
--- a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.v
+++ b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__edfxbp cell (
+    sky130_fd_sc_ls__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__edfxbp cell (
+    sky130_fd_sc_ls__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.v b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.v
index af25e97..c4d0a04 100644
--- a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.v
+++ b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.v
@@ -56,7 +56,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__edfxtp cell (
+    sky130_fd_sc_ls__edfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__edfxtp cell (
+    sky130_fd_sc_ls__edfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_1.v b/cells/einvn/sky130_fd_sc_ls__einvn_1.v
index 46b0852..a184474 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_1.v
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__einvn cell (
+    sky130_fd_sc_ls__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__einvn cell (
+    sky130_fd_sc_ls__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_2.v b/cells/einvn/sky130_fd_sc_ls__einvn_2.v
index 3a07dcd..c68d411 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_2.v
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__einvn cell (
+    sky130_fd_sc_ls__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__einvn cell (
+    sky130_fd_sc_ls__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_4.v b/cells/einvn/sky130_fd_sc_ls__einvn_4.v
index 70f8f43..7268742 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_4.v
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__einvn cell (
+    sky130_fd_sc_ls__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__einvn cell (
+    sky130_fd_sc_ls__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_8.v b/cells/einvn/sky130_fd_sc_ls__einvn_8.v
index 3224e57..4a89c5a 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_8.v
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__einvn cell (
+    sky130_fd_sc_ls__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__einvn cell (
+    sky130_fd_sc_ls__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_1.v b/cells/einvp/sky130_fd_sc_ls__einvp_1.v
index 0aa1043..437c5e1 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_1.v
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__einvp cell (
+    sky130_fd_sc_ls__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__einvp cell (
+    sky130_fd_sc_ls__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_2.v b/cells/einvp/sky130_fd_sc_ls__einvp_2.v
index 5037668..22c35b4 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_2.v
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__einvp cell (
+    sky130_fd_sc_ls__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__einvp cell (
+    sky130_fd_sc_ls__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_4.v b/cells/einvp/sky130_fd_sc_ls__einvp_4.v
index 818b93e..5460f9b 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_4.v
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__einvp cell (
+    sky130_fd_sc_ls__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__einvp cell (
+    sky130_fd_sc_ls__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_8.v b/cells/einvp/sky130_fd_sc_ls__einvp_8.v
index 6c25f10..8781553 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_8.v
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__einvp cell (
+    sky130_fd_sc_ls__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__einvp cell (
+    sky130_fd_sc_ls__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/fa/sky130_fd_sc_ls__fa_1.v b/cells/fa/sky130_fd_sc_ls__fa_1.v
index bb73f90..1ce3efc 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_1.v
+++ b/cells/fa/sky130_fd_sc_ls__fa_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__fa cell (
+    sky130_fd_sc_ls__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fa cell (
+    sky130_fd_sc_ls__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_ls__fa_2.v b/cells/fa/sky130_fd_sc_ls__fa_2.v
index 26ebd40..14bf370 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_2.v
+++ b/cells/fa/sky130_fd_sc_ls__fa_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__fa cell (
+    sky130_fd_sc_ls__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fa cell (
+    sky130_fd_sc_ls__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_ls__fa_4.v b/cells/fa/sky130_fd_sc_ls__fa_4.v
index 15c0a92..4e77ddb 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_4.v
+++ b/cells/fa/sky130_fd_sc_ls__fa_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__fa cell (
+    sky130_fd_sc_ls__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fa cell (
+    sky130_fd_sc_ls__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_ls__fah_1.v b/cells/fah/sky130_fd_sc_ls__fah_1.v
index e4be6c4..c039e4e 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_1.v
+++ b/cells/fah/sky130_fd_sc_ls__fah_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__fah cell (
+    sky130_fd_sc_ls__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fah cell (
+    sky130_fd_sc_ls__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_ls__fah_2.v b/cells/fah/sky130_fd_sc_ls__fah_2.v
index 6fca130..67568de 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_2.v
+++ b/cells/fah/sky130_fd_sc_ls__fah_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__fah cell (
+    sky130_fd_sc_ls__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fah cell (
+    sky130_fd_sc_ls__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_ls__fah_4.v b/cells/fah/sky130_fd_sc_ls__fah_4.v
index b5d2fd6..e1b6100 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_4.v
+++ b/cells/fah/sky130_fd_sc_ls__fah_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__fah cell (
+    sky130_fd_sc_ls__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fah cell (
+    sky130_fd_sc_ls__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.v b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.v
index 59a2f62..63469ca 100644
--- a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.v
+++ b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__fahcin cell (
+    sky130_fd_sc_ls__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fahcin cell (
+    sky130_fd_sc_ls__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.v b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.v
index e5f53b6..83e98e0 100644
--- a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.v
+++ b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.v
@@ -57,7 +57,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ls__fahcon cell (
+    sky130_fd_sc_ls__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fahcon cell (
+    sky130_fd_sc_ls__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fill/sky130_fd_sc_ls__fill_1.v b/cells/fill/sky130_fd_sc_ls__fill_1.v
index bd9ac2b..5420d1a 100644
--- a/cells/fill/sky130_fd_sc_ls__fill_1.v
+++ b/cells/fill/sky130_fd_sc_ls__fill_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__fill cell (
+    sky130_fd_sc_ls__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fill cell ();
+    sky130_fd_sc_ls__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_ls__fill_2.v b/cells/fill/sky130_fd_sc_ls__fill_2.v
index 0b9f945..cd12a35 100644
--- a/cells/fill/sky130_fd_sc_ls__fill_2.v
+++ b/cells/fill/sky130_fd_sc_ls__fill_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__fill cell (
+    sky130_fd_sc_ls__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fill cell ();
+    sky130_fd_sc_ls__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_ls__fill_4.v b/cells/fill/sky130_fd_sc_ls__fill_4.v
index d1411e3..448114c 100644
--- a/cells/fill/sky130_fd_sc_ls__fill_4.v
+++ b/cells/fill/sky130_fd_sc_ls__fill_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__fill cell (
+    sky130_fd_sc_ls__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fill cell ();
+    sky130_fd_sc_ls__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_ls__fill_8.v b/cells/fill/sky130_fd_sc_ls__fill_8.v
index b52afb0..915714d 100644
--- a/cells/fill/sky130_fd_sc_ls__fill_8.v
+++ b/cells/fill/sky130_fd_sc_ls__fill_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__fill cell (
+    sky130_fd_sc_ls__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fill cell ();
+    sky130_fd_sc_ls__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_2.v b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_2.v
index bb5d2d3..0597e41 100644
--- a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_2.v
+++ b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__fill_diode cell (
+    sky130_fd_sc_ls__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fill_diode cell ();
+    sky130_fd_sc_ls__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_4.v b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_4.v
index 34c9e9e..7d391ea 100644
--- a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_4.v
+++ b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__fill_diode cell (
+    sky130_fd_sc_ls__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fill_diode cell ();
+    sky130_fd_sc_ls__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_8.v b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_8.v
index e140afd..56a0fac 100644
--- a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_8.v
+++ b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__fill_diode cell (
+    sky130_fd_sc_ls__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__fill_diode cell ();
+    sky130_fd_sc_ls__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/ha/sky130_fd_sc_ls__ha_1.v b/cells/ha/sky130_fd_sc_ls__ha_1.v
index 84f1d8d..fb33c5b 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_1.v
+++ b/cells/ha/sky130_fd_sc_ls__ha_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__ha cell (
+    sky130_fd_sc_ls__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__ha cell (
+    sky130_fd_sc_ls__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_ls__ha_2.v b/cells/ha/sky130_fd_sc_ls__ha_2.v
index 0859313..6f0195d 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_2.v
+++ b/cells/ha/sky130_fd_sc_ls__ha_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__ha cell (
+    sky130_fd_sc_ls__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__ha cell (
+    sky130_fd_sc_ls__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_ls__ha_4.v b/cells/ha/sky130_fd_sc_ls__ha_4.v
index 6d1653a..2c05904 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_4.v
+++ b/cells/ha/sky130_fd_sc_ls__ha_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__ha cell (
+    sky130_fd_sc_ls__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__ha cell (
+    sky130_fd_sc_ls__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/inv/sky130_fd_sc_ls__inv_1.v b/cells/inv/sky130_fd_sc_ls__inv_1.v
index 0a47779..fc9dc44 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_1.v
+++ b/cells/inv/sky130_fd_sc_ls__inv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_ls__inv_16.v b/cells/inv/sky130_fd_sc_ls__inv_16.v
index b78d9c9..aee84f6 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_16.v
+++ b/cells/inv/sky130_fd_sc_ls__inv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_ls__inv_2.v b/cells/inv/sky130_fd_sc_ls__inv_2.v
index bcc80ef..d6e1cb2 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_2.v
+++ b/cells/inv/sky130_fd_sc_ls__inv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_ls__inv_4.v b/cells/inv/sky130_fd_sc_ls__inv_4.v
index 0e59b16..04a8de4 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_4.v
+++ b/cells/inv/sky130_fd_sc_ls__inv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_ls__inv_8.v b/cells/inv/sky130_fd_sc_ls__inv_8.v
index 682d78e..b152e44 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_8.v
+++ b/cells/inv/sky130_fd_sc_ls__inv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__inv cell (
+    sky130_fd_sc_ls__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_1.v b/cells/maj3/sky130_fd_sc_ls__maj3_1.v
index a0543d0..bb42779 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_1.v
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__maj3 cell (
+    sky130_fd_sc_ls__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__maj3 cell (
+    sky130_fd_sc_ls__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_2.v b/cells/maj3/sky130_fd_sc_ls__maj3_2.v
index 19c016b..ff494c1 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_2.v
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__maj3 cell (
+    sky130_fd_sc_ls__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__maj3 cell (
+    sky130_fd_sc_ls__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_4.v b/cells/maj3/sky130_fd_sc_ls__maj3_4.v
index 9aa7ce1..f8ddb7a 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_4.v
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__maj3 cell (
+    sky130_fd_sc_ls__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__maj3 cell (
+    sky130_fd_sc_ls__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_1.v b/cells/mux2/sky130_fd_sc_ls__mux2_1.v
index c409d8d..01727a1 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_1.v
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux2 cell (
+    sky130_fd_sc_ls__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux2 cell (
+    sky130_fd_sc_ls__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_2.v b/cells/mux2/sky130_fd_sc_ls__mux2_2.v
index 4db0d22..3598916 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_2.v
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux2 cell (
+    sky130_fd_sc_ls__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux2 cell (
+    sky130_fd_sc_ls__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_4.v b/cells/mux2/sky130_fd_sc_ls__mux2_4.v
index eed1a02..1945f23 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_4.v
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux2 cell (
+    sky130_fd_sc_ls__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux2 cell (
+    sky130_fd_sc_ls__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.v b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.v
index aa72b58..71a7529 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.v
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux2i cell (
+    sky130_fd_sc_ls__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux2i cell (
+    sky130_fd_sc_ls__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.v b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.v
index 6418a3b..3669afe 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.v
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux2i cell (
+    sky130_fd_sc_ls__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux2i cell (
+    sky130_fd_sc_ls__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.v b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.v
index d8acff8..1ebd89b 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.v
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux2i cell (
+    sky130_fd_sc_ls__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux2i cell (
+    sky130_fd_sc_ls__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_1.v b/cells/mux4/sky130_fd_sc_ls__mux4_1.v
index ca62c7d..fefe2ef 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_1.v
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux4 cell (
+    sky130_fd_sc_ls__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux4 cell (
+    sky130_fd_sc_ls__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_2.v b/cells/mux4/sky130_fd_sc_ls__mux4_2.v
index a4a15f4..b3434e5 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_2.v
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux4 cell (
+    sky130_fd_sc_ls__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux4 cell (
+    sky130_fd_sc_ls__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_4.v b/cells/mux4/sky130_fd_sc_ls__mux4_4.v
index bab9225..54d59e8 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_4.v
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__mux4 cell (
+    sky130_fd_sc_ls__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__mux4 cell (
+    sky130_fd_sc_ls__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_1.v b/cells/nand2/sky130_fd_sc_ls__nand2_1.v
index 17a3873..7cebcee 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_1.v
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand2 cell (
+    sky130_fd_sc_ls__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand2 cell (
+    sky130_fd_sc_ls__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_2.v b/cells/nand2/sky130_fd_sc_ls__nand2_2.v
index 21b3687..db4f75f 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_2.v
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand2 cell (
+    sky130_fd_sc_ls__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand2 cell (
+    sky130_fd_sc_ls__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_4.v b/cells/nand2/sky130_fd_sc_ls__nand2_4.v
index 6553762..1f04496 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_4.v
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand2 cell (
+    sky130_fd_sc_ls__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand2 cell (
+    sky130_fd_sc_ls__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_8.v b/cells/nand2/sky130_fd_sc_ls__nand2_8.v
index 9453074..48bd1af 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_8.v
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand2 cell (
+    sky130_fd_sc_ls__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand2 cell (
+    sky130_fd_sc_ls__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.v b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.v
index 681104e..aed7d4e 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.v
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand2b cell (
+    sky130_fd_sc_ls__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand2b cell (
+    sky130_fd_sc_ls__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.v b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.v
index 6b5b575..deff73a 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.v
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand2b cell (
+    sky130_fd_sc_ls__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand2b cell (
+    sky130_fd_sc_ls__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.v b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.v
index 82aa0cc..46984d0 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.v
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand2b cell (
+    sky130_fd_sc_ls__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand2b cell (
+    sky130_fd_sc_ls__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_1.v b/cells/nand3/sky130_fd_sc_ls__nand3_1.v
index 7d56f07..4f385aa 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_1.v
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand3 cell (
+    sky130_fd_sc_ls__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand3 cell (
+    sky130_fd_sc_ls__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_2.v b/cells/nand3/sky130_fd_sc_ls__nand3_2.v
index f865e4e..45f0d42 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_2.v
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand3 cell (
+    sky130_fd_sc_ls__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand3 cell (
+    sky130_fd_sc_ls__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_4.v b/cells/nand3/sky130_fd_sc_ls__nand3_4.v
index 00809e6..8088b84 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_4.v
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand3 cell (
+    sky130_fd_sc_ls__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand3 cell (
+    sky130_fd_sc_ls__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.v b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.v
index bfb2aff..f727e45 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.v
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand3b cell (
+    sky130_fd_sc_ls__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand3b cell (
+    sky130_fd_sc_ls__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.v b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.v
index 4377048..aea12be 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.v
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand3b cell (
+    sky130_fd_sc_ls__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand3b cell (
+    sky130_fd_sc_ls__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.v b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.v
index c8fb869..fa50a59 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.v
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand3b cell (
+    sky130_fd_sc_ls__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand3b cell (
+    sky130_fd_sc_ls__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_1.v b/cells/nand4/sky130_fd_sc_ls__nand4_1.v
index 9fbbd68..b9148de 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_1.v
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4 cell (
+    sky130_fd_sc_ls__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4 cell (
+    sky130_fd_sc_ls__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_2.v b/cells/nand4/sky130_fd_sc_ls__nand4_2.v
index d414a06..8aae552 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_2.v
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4 cell (
+    sky130_fd_sc_ls__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4 cell (
+    sky130_fd_sc_ls__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_4.v b/cells/nand4/sky130_fd_sc_ls__nand4_4.v
index d1f7c8c..44465ae 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_4.v
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4 cell (
+    sky130_fd_sc_ls__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4 cell (
+    sky130_fd_sc_ls__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.v b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.v
index 96b5db1..8e921a2 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.v
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4b cell (
+    sky130_fd_sc_ls__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4b cell (
+    sky130_fd_sc_ls__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.v b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.v
index 06dbcd6..cbf38bb 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.v
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4b cell (
+    sky130_fd_sc_ls__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4b cell (
+    sky130_fd_sc_ls__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.v b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.v
index 674917c..cfb6e4d 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.v
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4b cell (
+    sky130_fd_sc_ls__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4b cell (
+    sky130_fd_sc_ls__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.v b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.v
index bcc13d5..51116e9 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.v
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4bb cell (
+    sky130_fd_sc_ls__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4bb cell (
+    sky130_fd_sc_ls__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.v b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.v
index f4d390a..0c91d1e 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.v
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4bb cell (
+    sky130_fd_sc_ls__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4bb cell (
+    sky130_fd_sc_ls__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.v b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.v
index 15726bf..bc6e3d0 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.v
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nand4bb cell (
+    sky130_fd_sc_ls__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nand4bb cell (
+    sky130_fd_sc_ls__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_1.v b/cells/nor2/sky130_fd_sc_ls__nor2_1.v
index 1392a1f..c510ca5 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_1.v
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor2 cell (
+    sky130_fd_sc_ls__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor2 cell (
+    sky130_fd_sc_ls__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_2.v b/cells/nor2/sky130_fd_sc_ls__nor2_2.v
index f6e72a1..d570e8c 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_2.v
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor2 cell (
+    sky130_fd_sc_ls__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor2 cell (
+    sky130_fd_sc_ls__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_4.v b/cells/nor2/sky130_fd_sc_ls__nor2_4.v
index 43c96ef..8cdbec2 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_4.v
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor2 cell (
+    sky130_fd_sc_ls__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor2 cell (
+    sky130_fd_sc_ls__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_8.v b/cells/nor2/sky130_fd_sc_ls__nor2_8.v
index b37f669..f06520a 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_8.v
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor2 cell (
+    sky130_fd_sc_ls__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor2 cell (
+    sky130_fd_sc_ls__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.v b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.v
index e7471cd..03b78f9 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.v
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor2b cell (
+    sky130_fd_sc_ls__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor2b cell (
+    sky130_fd_sc_ls__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.v b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.v
index ffe3b3b..fd3801c 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.v
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor2b cell (
+    sky130_fd_sc_ls__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor2b cell (
+    sky130_fd_sc_ls__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.v b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.v
index 5f4861d..27a861e 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.v
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor2b cell (
+    sky130_fd_sc_ls__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor2b cell (
+    sky130_fd_sc_ls__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_1.v b/cells/nor3/sky130_fd_sc_ls__nor3_1.v
index 0bea6f6..c5d8086 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_1.v
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor3 cell (
+    sky130_fd_sc_ls__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor3 cell (
+    sky130_fd_sc_ls__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_2.v b/cells/nor3/sky130_fd_sc_ls__nor3_2.v
index c1b9cc3..9d0c13e 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_2.v
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor3 cell (
+    sky130_fd_sc_ls__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor3 cell (
+    sky130_fd_sc_ls__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_4.v b/cells/nor3/sky130_fd_sc_ls__nor3_4.v
index 3b5fe66..8aaddc3 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_4.v
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor3 cell (
+    sky130_fd_sc_ls__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor3 cell (
+    sky130_fd_sc_ls__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.v b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.v
index 511b6f8..d7bff19 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.v
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor3b cell (
+    sky130_fd_sc_ls__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor3b cell (
+    sky130_fd_sc_ls__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.v b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.v
index 6c81cf0..606bf36 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.v
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor3b cell (
+    sky130_fd_sc_ls__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor3b cell (
+    sky130_fd_sc_ls__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.v b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.v
index 99c67e3..5f1ecbb 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.v
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor3b cell (
+    sky130_fd_sc_ls__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor3b cell (
+    sky130_fd_sc_ls__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_1.v b/cells/nor4/sky130_fd_sc_ls__nor4_1.v
index ee8a8c4..83db917 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_1.v
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4 cell (
+    sky130_fd_sc_ls__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4 cell (
+    sky130_fd_sc_ls__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_2.v b/cells/nor4/sky130_fd_sc_ls__nor4_2.v
index 2ae6a65..62b8b62 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_2.v
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4 cell (
+    sky130_fd_sc_ls__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4 cell (
+    sky130_fd_sc_ls__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_4.v b/cells/nor4/sky130_fd_sc_ls__nor4_4.v
index fb1fb3f..b84830d 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_4.v
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4 cell (
+    sky130_fd_sc_ls__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4 cell (
+    sky130_fd_sc_ls__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.v b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.v
index 498f13a..6f6872e 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.v
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4b cell (
+    sky130_fd_sc_ls__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4b cell (
+    sky130_fd_sc_ls__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.v b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.v
index b35f959..9056e49 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.v
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4b cell (
+    sky130_fd_sc_ls__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4b cell (
+    sky130_fd_sc_ls__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.v b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.v
index 98ffcac..831384b 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.v
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4b cell (
+    sky130_fd_sc_ls__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4b cell (
+    sky130_fd_sc_ls__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.v b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.v
index 31db803..6621085 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.v
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4bb cell (
+    sky130_fd_sc_ls__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4bb cell (
+    sky130_fd_sc_ls__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.v b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.v
index 72f5834..611dc81 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.v
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4bb cell (
+    sky130_fd_sc_ls__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4bb cell (
+    sky130_fd_sc_ls__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.v b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.v
index ef63416..9a2b69c 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.v
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__nor4bb cell (
+    sky130_fd_sc_ls__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__nor4bb cell (
+    sky130_fd_sc_ls__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.v b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.v
index 50af710..a3debc1 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.v
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2111a cell (
+    sky130_fd_sc_ls__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2111a cell (
+    sky130_fd_sc_ls__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.v b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.v
index f3a3c57..144c930 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.v
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2111a cell (
+    sky130_fd_sc_ls__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2111a cell (
+    sky130_fd_sc_ls__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.v b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.v
index 7199b80..3e4ae70 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.v
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2111a cell (
+    sky130_fd_sc_ls__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2111a cell (
+    sky130_fd_sc_ls__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.v b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.v
index 5e41223..d2625fd 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.v
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2111ai cell (
+    sky130_fd_sc_ls__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2111ai cell (
+    sky130_fd_sc_ls__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.v b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.v
index eb905c2..9cec160 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.v
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2111ai cell (
+    sky130_fd_sc_ls__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2111ai cell (
+    sky130_fd_sc_ls__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.v b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.v
index 6cfde1b..d99a4ea 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.v
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2111ai cell (
+    sky130_fd_sc_ls__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2111ai cell (
+    sky130_fd_sc_ls__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_1.v b/cells/o211a/sky130_fd_sc_ls__o211a_1.v
index 0cf5cea..1840853 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_1.v
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o211a cell (
+    sky130_fd_sc_ls__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o211a cell (
+    sky130_fd_sc_ls__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_2.v b/cells/o211a/sky130_fd_sc_ls__o211a_2.v
index d3ce16d..fae81be 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_2.v
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o211a cell (
+    sky130_fd_sc_ls__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o211a cell (
+    sky130_fd_sc_ls__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_4.v b/cells/o211a/sky130_fd_sc_ls__o211a_4.v
index c982a01..24eb78b 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_4.v
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o211a cell (
+    sky130_fd_sc_ls__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o211a cell (
+    sky130_fd_sc_ls__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.v b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.v
index ea6dd80..9797cd4 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.v
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o211ai cell (
+    sky130_fd_sc_ls__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o211ai cell (
+    sky130_fd_sc_ls__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.v b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.v
index 41f3399..552814b 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.v
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o211ai cell (
+    sky130_fd_sc_ls__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o211ai cell (
+    sky130_fd_sc_ls__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.v b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.v
index 231c1e1..e074b71 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.v
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o211ai cell (
+    sky130_fd_sc_ls__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o211ai cell (
+    sky130_fd_sc_ls__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_1.v b/cells/o21a/sky130_fd_sc_ls__o21a_1.v
index cebb775..ad56f2a 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_1.v
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21a cell (
+    sky130_fd_sc_ls__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21a cell (
+    sky130_fd_sc_ls__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_2.v b/cells/o21a/sky130_fd_sc_ls__o21a_2.v
index a564e13..88a4475 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_2.v
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21a cell (
+    sky130_fd_sc_ls__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21a cell (
+    sky130_fd_sc_ls__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_4.v b/cells/o21a/sky130_fd_sc_ls__o21a_4.v
index b486e95..2318dd6 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_4.v
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21a cell (
+    sky130_fd_sc_ls__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21a cell (
+    sky130_fd_sc_ls__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.v b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.v
index 035b198..9aaa891 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.v
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21ai cell (
+    sky130_fd_sc_ls__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21ai cell (
+    sky130_fd_sc_ls__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.v b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.v
index 2836722..709f769 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.v
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21ai cell (
+    sky130_fd_sc_ls__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21ai cell (
+    sky130_fd_sc_ls__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.v b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.v
index 7aee35c..762d7d3 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.v
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21ai cell (
+    sky130_fd_sc_ls__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21ai cell (
+    sky130_fd_sc_ls__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.v b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.v
index 30aa5cc..82cc654 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.v
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21ba cell (
+    sky130_fd_sc_ls__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21ba cell (
+    sky130_fd_sc_ls__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.v b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.v
index d2d1c77..dccb78b 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.v
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21ba cell (
+    sky130_fd_sc_ls__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21ba cell (
+    sky130_fd_sc_ls__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.v b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.v
index 95e9d4b..6198122 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.v
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21ba cell (
+    sky130_fd_sc_ls__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21ba cell (
+    sky130_fd_sc_ls__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.v b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.v
index fec6e59..653a1f4 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.v
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21bai cell (
+    sky130_fd_sc_ls__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21bai cell (
+    sky130_fd_sc_ls__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.v b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.v
index 2f9b8c2..540f24c 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.v
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21bai cell (
+    sky130_fd_sc_ls__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21bai cell (
+    sky130_fd_sc_ls__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.v b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.v
index 5487442..19c4ca8 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.v
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o21bai cell (
+    sky130_fd_sc_ls__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o21bai cell (
+    sky130_fd_sc_ls__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_1.v b/cells/o221a/sky130_fd_sc_ls__o221a_1.v
index 8c53326..fb3d7b3 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_1.v
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o221a cell (
+    sky130_fd_sc_ls__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o221a cell (
+    sky130_fd_sc_ls__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_2.v b/cells/o221a/sky130_fd_sc_ls__o221a_2.v
index fe24718..35d5993 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_2.v
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o221a cell (
+    sky130_fd_sc_ls__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o221a cell (
+    sky130_fd_sc_ls__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_4.v b/cells/o221a/sky130_fd_sc_ls__o221a_4.v
index f2bb2ff..3350863 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_4.v
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o221a cell (
+    sky130_fd_sc_ls__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o221a cell (
+    sky130_fd_sc_ls__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.v b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.v
index 4ac8e8c..a728a81 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.v
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o221ai cell (
+    sky130_fd_sc_ls__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o221ai cell (
+    sky130_fd_sc_ls__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.v b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.v
index 81ce962..1ce4186 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.v
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o221ai cell (
+    sky130_fd_sc_ls__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o221ai cell (
+    sky130_fd_sc_ls__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.v b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.v
index 3e5374a..27ec38e 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.v
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o221ai cell (
+    sky130_fd_sc_ls__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o221ai cell (
+    sky130_fd_sc_ls__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_1.v b/cells/o22a/sky130_fd_sc_ls__o22a_1.v
index 602c717..2f4078f 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_1.v
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o22a cell (
+    sky130_fd_sc_ls__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o22a cell (
+    sky130_fd_sc_ls__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_2.v b/cells/o22a/sky130_fd_sc_ls__o22a_2.v
index 3264c28..ab03e88 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_2.v
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o22a cell (
+    sky130_fd_sc_ls__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o22a cell (
+    sky130_fd_sc_ls__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_4.v b/cells/o22a/sky130_fd_sc_ls__o22a_4.v
index 11d4dfc..9f47602 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_4.v
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o22a cell (
+    sky130_fd_sc_ls__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o22a cell (
+    sky130_fd_sc_ls__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.v b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.v
index 308cad1..3e2a714 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.v
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o22ai cell (
+    sky130_fd_sc_ls__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o22ai cell (
+    sky130_fd_sc_ls__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.v b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.v
index 4b7cea9..e134154 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.v
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o22ai cell (
+    sky130_fd_sc_ls__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o22ai cell (
+    sky130_fd_sc_ls__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.v b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.v
index 91279d6..ac66000 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.v
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o22ai cell (
+    sky130_fd_sc_ls__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o22ai cell (
+    sky130_fd_sc_ls__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.v b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.v
index 8703973..19fe6b0 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.v
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2bb2a cell (
+    sky130_fd_sc_ls__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2bb2a cell (
+    sky130_fd_sc_ls__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.v b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.v
index d073dda..8da92aa 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.v
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2bb2a cell (
+    sky130_fd_sc_ls__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2bb2a cell (
+    sky130_fd_sc_ls__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.v b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.v
index a713ef1..355df0f 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.v
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2bb2a cell (
+    sky130_fd_sc_ls__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2bb2a cell (
+    sky130_fd_sc_ls__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.v b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.v
index b970e30..89e0599 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.v
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2bb2ai cell (
+    sky130_fd_sc_ls__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2bb2ai cell (
+    sky130_fd_sc_ls__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.v b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.v
index fb551aa..e5cd463 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.v
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2bb2ai cell (
+    sky130_fd_sc_ls__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2bb2ai cell (
+    sky130_fd_sc_ls__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.v b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.v
index 4b01e0c..2dbdc7a 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.v
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o2bb2ai cell (
+    sky130_fd_sc_ls__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o2bb2ai cell (
+    sky130_fd_sc_ls__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_1.v b/cells/o311a/sky130_fd_sc_ls__o311a_1.v
index d40d27a..6f0c574 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_1.v
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o311a cell (
+    sky130_fd_sc_ls__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o311a cell (
+    sky130_fd_sc_ls__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_2.v b/cells/o311a/sky130_fd_sc_ls__o311a_2.v
index c595fe6..85fb918 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_2.v
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o311a cell (
+    sky130_fd_sc_ls__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o311a cell (
+    sky130_fd_sc_ls__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_4.v b/cells/o311a/sky130_fd_sc_ls__o311a_4.v
index 4cb4c1b..8c5bf4d 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_4.v
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o311a cell (
+    sky130_fd_sc_ls__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o311a cell (
+    sky130_fd_sc_ls__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.v b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.v
index 4755299..d7503a6 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.v
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o311ai cell (
+    sky130_fd_sc_ls__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o311ai cell (
+    sky130_fd_sc_ls__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.v b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.v
index dee45f3..b476e1a 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.v
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o311ai cell (
+    sky130_fd_sc_ls__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o311ai cell (
+    sky130_fd_sc_ls__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.v b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.v
index 0c838a7..d9e2c20 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.v
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o311ai cell (
+    sky130_fd_sc_ls__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o311ai cell (
+    sky130_fd_sc_ls__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_1.v b/cells/o31a/sky130_fd_sc_ls__o31a_1.v
index f2051d3..5f6dbe3 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_1.v
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o31a cell (
+    sky130_fd_sc_ls__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o31a cell (
+    sky130_fd_sc_ls__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_2.v b/cells/o31a/sky130_fd_sc_ls__o31a_2.v
index 6a35d45..cd44610 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_2.v
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o31a cell (
+    sky130_fd_sc_ls__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o31a cell (
+    sky130_fd_sc_ls__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_4.v b/cells/o31a/sky130_fd_sc_ls__o31a_4.v
index f5faca5..c0b3823 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_4.v
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o31a cell (
+    sky130_fd_sc_ls__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o31a cell (
+    sky130_fd_sc_ls__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.v b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.v
index 0405a11..9743415 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.v
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o31ai cell (
+    sky130_fd_sc_ls__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o31ai cell (
+    sky130_fd_sc_ls__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.v b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.v
index 6e722ca..2a8ffbc 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.v
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o31ai cell (
+    sky130_fd_sc_ls__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o31ai cell (
+    sky130_fd_sc_ls__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.v b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.v
index f430989..0d50ced 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.v
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o31ai cell (
+    sky130_fd_sc_ls__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o31ai cell (
+    sky130_fd_sc_ls__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_1.v b/cells/o32a/sky130_fd_sc_ls__o32a_1.v
index 358e82e..0a7a63b 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_1.v
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o32a cell (
+    sky130_fd_sc_ls__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o32a cell (
+    sky130_fd_sc_ls__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_2.v b/cells/o32a/sky130_fd_sc_ls__o32a_2.v
index 3bb8342..0f402ff 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_2.v
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o32a cell (
+    sky130_fd_sc_ls__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o32a cell (
+    sky130_fd_sc_ls__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_4.v b/cells/o32a/sky130_fd_sc_ls__o32a_4.v
index f072939..4c049c2 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_4.v
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o32a cell (
+    sky130_fd_sc_ls__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o32a cell (
+    sky130_fd_sc_ls__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.v b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.v
index 227f947..72db5a4 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.v
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o32ai cell (
+    sky130_fd_sc_ls__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o32ai cell (
+    sky130_fd_sc_ls__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.v b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.v
index afbc2d6..d5e8a2a 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.v
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o32ai cell (
+    sky130_fd_sc_ls__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o32ai cell (
+    sky130_fd_sc_ls__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.v b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.v
index 341cf06..9096345 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.v
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o32ai cell (
+    sky130_fd_sc_ls__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o32ai cell (
+    sky130_fd_sc_ls__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_1.v b/cells/o41a/sky130_fd_sc_ls__o41a_1.v
index cf26c21..fa21548 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_1.v
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o41a cell (
+    sky130_fd_sc_ls__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o41a cell (
+    sky130_fd_sc_ls__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_2.v b/cells/o41a/sky130_fd_sc_ls__o41a_2.v
index 33bed34..d1eeee3 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_2.v
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o41a cell (
+    sky130_fd_sc_ls__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o41a cell (
+    sky130_fd_sc_ls__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_4.v b/cells/o41a/sky130_fd_sc_ls__o41a_4.v
index de300fb..7bf2153 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_4.v
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o41a cell (
+    sky130_fd_sc_ls__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o41a cell (
+    sky130_fd_sc_ls__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.v b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.v
index ef0b767..40af70c 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.v
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o41ai cell (
+    sky130_fd_sc_ls__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o41ai cell (
+    sky130_fd_sc_ls__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.v b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.v
index c407810..07c72e3 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.v
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o41ai cell (
+    sky130_fd_sc_ls__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o41ai cell (
+    sky130_fd_sc_ls__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.v b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.v
index b715866..7b6ed0f 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.v
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__o41ai cell (
+    sky130_fd_sc_ls__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__o41ai cell (
+    sky130_fd_sc_ls__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/or2/sky130_fd_sc_ls__or2_1.v b/cells/or2/sky130_fd_sc_ls__or2_1.v
index 41cbcea..eb82fc8 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_1.v
+++ b/cells/or2/sky130_fd_sc_ls__or2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or2 cell (
+    sky130_fd_sc_ls__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or2 cell (
+    sky130_fd_sc_ls__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_ls__or2_2.v b/cells/or2/sky130_fd_sc_ls__or2_2.v
index 9506ff6..72af530 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_2.v
+++ b/cells/or2/sky130_fd_sc_ls__or2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or2 cell (
+    sky130_fd_sc_ls__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or2 cell (
+    sky130_fd_sc_ls__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_ls__or2_4.v b/cells/or2/sky130_fd_sc_ls__or2_4.v
index 0678467..3d712e7 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_4.v
+++ b/cells/or2/sky130_fd_sc_ls__or2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or2 cell (
+    sky130_fd_sc_ls__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or2 cell (
+    sky130_fd_sc_ls__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_1.v b/cells/or2b/sky130_fd_sc_ls__or2b_1.v
index 38d68c5..354895b 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_1.v
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or2b cell (
+    sky130_fd_sc_ls__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or2b cell (
+    sky130_fd_sc_ls__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_2.v b/cells/or2b/sky130_fd_sc_ls__or2b_2.v
index e2f4776..e159644 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_2.v
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or2b cell (
+    sky130_fd_sc_ls__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or2b cell (
+    sky130_fd_sc_ls__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_4.v b/cells/or2b/sky130_fd_sc_ls__or2b_4.v
index 65477b4..12744e8 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_4.v
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or2b cell (
+    sky130_fd_sc_ls__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or2b cell (
+    sky130_fd_sc_ls__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or3/sky130_fd_sc_ls__or3_1.v b/cells/or3/sky130_fd_sc_ls__or3_1.v
index 9c64cb6..6683ed8 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_1.v
+++ b/cells/or3/sky130_fd_sc_ls__or3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or3 cell (
+    sky130_fd_sc_ls__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or3 cell (
+    sky130_fd_sc_ls__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_ls__or3_2.v b/cells/or3/sky130_fd_sc_ls__or3_2.v
index 8e84640..e4bfeb2 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_2.v
+++ b/cells/or3/sky130_fd_sc_ls__or3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or3 cell (
+    sky130_fd_sc_ls__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or3 cell (
+    sky130_fd_sc_ls__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_ls__or3_4.v b/cells/or3/sky130_fd_sc_ls__or3_4.v
index f1e2080..389808b 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_4.v
+++ b/cells/or3/sky130_fd_sc_ls__or3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or3 cell (
+    sky130_fd_sc_ls__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or3 cell (
+    sky130_fd_sc_ls__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_1.v b/cells/or3b/sky130_fd_sc_ls__or3b_1.v
index aa4733a..8029333 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_1.v
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or3b cell (
+    sky130_fd_sc_ls__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or3b cell (
+    sky130_fd_sc_ls__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_2.v b/cells/or3b/sky130_fd_sc_ls__or3b_2.v
index 295015d..6d43025 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_2.v
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or3b cell (
+    sky130_fd_sc_ls__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or3b cell (
+    sky130_fd_sc_ls__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_4.v b/cells/or3b/sky130_fd_sc_ls__or3b_4.v
index e1716b6..eed2f18 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_4.v
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or3b cell (
+    sky130_fd_sc_ls__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or3b cell (
+    sky130_fd_sc_ls__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_ls__or4_1.v b/cells/or4/sky130_fd_sc_ls__or4_1.v
index 000cd11..9c94b24 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_1.v
+++ b/cells/or4/sky130_fd_sc_ls__or4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4 cell (
+    sky130_fd_sc_ls__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4 cell (
+    sky130_fd_sc_ls__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_ls__or4_2.v b/cells/or4/sky130_fd_sc_ls__or4_2.v
index 39b0e09..fdf348b 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_2.v
+++ b/cells/or4/sky130_fd_sc_ls__or4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4 cell (
+    sky130_fd_sc_ls__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4 cell (
+    sky130_fd_sc_ls__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_ls__or4_4.v b/cells/or4/sky130_fd_sc_ls__or4_4.v
index bf9e9e6..2b58aaf 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_4.v
+++ b/cells/or4/sky130_fd_sc_ls__or4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4 cell (
+    sky130_fd_sc_ls__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4 cell (
+    sky130_fd_sc_ls__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_1.v b/cells/or4b/sky130_fd_sc_ls__or4b_1.v
index e396ef6..53efd2c 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_1.v
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4b cell (
+    sky130_fd_sc_ls__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4b cell (
+    sky130_fd_sc_ls__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_2.v b/cells/or4b/sky130_fd_sc_ls__or4b_2.v
index c00e282..8a183a9 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_2.v
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4b cell (
+    sky130_fd_sc_ls__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4b cell (
+    sky130_fd_sc_ls__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_4.v b/cells/or4b/sky130_fd_sc_ls__or4b_4.v
index aaf0296..c732fa2 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_4.v
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4b cell (
+    sky130_fd_sc_ls__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4b cell (
+    sky130_fd_sc_ls__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.v b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.v
index cdb2846..9cb9959 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.v
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4bb cell (
+    sky130_fd_sc_ls__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4bb cell (
+    sky130_fd_sc_ls__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.v b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.v
index 0877ab9..50b331f 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.v
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4bb cell (
+    sky130_fd_sc_ls__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4bb cell (
+    sky130_fd_sc_ls__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.v b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.v
index d5ae212..9bb023e 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.v
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__or4bb cell (
+    sky130_fd_sc_ls__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__or4bb cell (
+    sky130_fd_sc_ls__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.v b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.v
index 740d8eb..195ac8f 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.v
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfbbn cell (
+    sky130_fd_sc_ls__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfbbn cell (
+    sky130_fd_sc_ls__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.v b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.v
index 686ea09..c292b13 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.v
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfbbn cell (
+    sky130_fd_sc_ls__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfbbn cell (
+    sky130_fd_sc_ls__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.v b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.v
index b93a1cf..ce87d47 100644
--- a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.v
+++ b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfbbp cell (
+    sky130_fd_sc_ls__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfbbp cell (
+    sky130_fd_sc_ls__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.v b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.v
index 35a85d9..279237c 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.v
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfrbp cell (
+    sky130_fd_sc_ls__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfrbp cell (
+    sky130_fd_sc_ls__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.v b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.v
index 5642dab..a20c8d5 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.v
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfrbp cell (
+    sky130_fd_sc_ls__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfrbp cell (
+    sky130_fd_sc_ls__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.v b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.v
index 3f4a832..3c67e3c 100644
--- a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.v
+++ b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfrtn cell (
+    sky130_fd_sc_ls__sdfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfrtn cell (
+    sky130_fd_sc_ls__sdfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.v b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.v
index 87ead17..75d41b4 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.v
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfrtp cell (
+    sky130_fd_sc_ls__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfrtp cell (
+    sky130_fd_sc_ls__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.v b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.v
index 17ba29c..19dacdf 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.v
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfrtp cell (
+    sky130_fd_sc_ls__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfrtp cell (
+    sky130_fd_sc_ls__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.v b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.v
index 18fe965..dea7775 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.v
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ls__sdfrtp cell (
+    sky130_fd_sc_ls__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfrtp cell (
+    sky130_fd_sc_ls__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.v b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.v
index bd95deb..31100c6 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.v
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__sdfsbp cell (
+    sky130_fd_sc_ls__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfsbp cell (
+    sky130_fd_sc_ls__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.v b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.v
index 4091591..32cda75 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.v
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__sdfsbp cell (
+    sky130_fd_sc_ls__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfsbp cell (
+    sky130_fd_sc_ls__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.v b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.v
index 2f8981c..1b16530 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.v
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__sdfstp cell (
+    sky130_fd_sc_ls__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfstp cell (
+    sky130_fd_sc_ls__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.v b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.v
index bbe4058..f631540 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.v
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__sdfstp cell (
+    sky130_fd_sc_ls__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfstp cell (
+    sky130_fd_sc_ls__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.v b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.v
index 6cbdf0c..a4f9f35 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.v
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ls__sdfstp cell (
+    sky130_fd_sc_ls__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfstp cell (
+    sky130_fd_sc_ls__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.v b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.v
index 6e13204..6698f63 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.v
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sdfxbp cell (
+    sky130_fd_sc_ls__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfxbp cell (
+    sky130_fd_sc_ls__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.v b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.v
index 93c3bf7..8244e48 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.v
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sdfxbp cell (
+    sky130_fd_sc_ls__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfxbp cell (
+    sky130_fd_sc_ls__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.v b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.v
index 1dd4a48..dd42194 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.v
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sdfxtp cell (
+    sky130_fd_sc_ls__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfxtp cell (
+    sky130_fd_sc_ls__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.v b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.v
index 566dfab..b1315a4 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.v
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sdfxtp cell (
+    sky130_fd_sc_ls__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfxtp cell (
+    sky130_fd_sc_ls__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.v b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.v
index c9d4ab0..1348db9 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.v
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sdfxtp cell (
+    sky130_fd_sc_ls__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdfxtp cell (
+    sky130_fd_sc_ls__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.v b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.v
index 5d4b8aa..9d8bd83 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.v
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sdlclkp cell (
+    sky130_fd_sc_ls__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdlclkp cell (
+    sky130_fd_sc_ls__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.v b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.v
index 8aa7a6e..d77a28d 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.v
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sdlclkp cell (
+    sky130_fd_sc_ls__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdlclkp cell (
+    sky130_fd_sc_ls__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.v b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.v
index 8a21c79..26e9699 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.v
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sdlclkp cell (
+    sky130_fd_sc_ls__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sdlclkp cell (
+    sky130_fd_sc_ls__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.v b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.v
index 89dc5ad..fcce614 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.v
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sedfxbp cell (
+    sky130_fd_sc_ls__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sedfxbp cell (
+    sky130_fd_sc_ls__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.v b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.v
index d9d1c4d..8ee4d3a 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.v
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sedfxbp cell (
+    sky130_fd_sc_ls__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sedfxbp cell (
+    sky130_fd_sc_ls__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.v b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.v
index 0368b07..0d53004 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.v
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sedfxtp cell (
+    sky130_fd_sc_ls__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sedfxtp cell (
+    sky130_fd_sc_ls__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.v b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.v
index 31f76a0..9b0aa22 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.v
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sedfxtp cell (
+    sky130_fd_sc_ls__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sedfxtp cell (
+    sky130_fd_sc_ls__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.v b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.v
index 4b47c4d..b9c140b 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.v
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__sedfxtp cell (
+    sky130_fd_sc_ls__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__sedfxtp cell (
+    sky130_fd_sc_ls__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/tap/sky130_fd_sc_ls__tap_1.v b/cells/tap/sky130_fd_sc_ls__tap_1.v
index 83b0458..ed40e0f 100644
--- a/cells/tap/sky130_fd_sc_ls__tap_1.v
+++ b/cells/tap/sky130_fd_sc_ls__tap_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__tap cell (
+    sky130_fd_sc_ls__tap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__tap cell ();
+    sky130_fd_sc_ls__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tap/sky130_fd_sc_ls__tap_2.v b/cells/tap/sky130_fd_sc_ls__tap_2.v
index 80d1709..e4e8ac3 100644
--- a/cells/tap/sky130_fd_sc_ls__tap_2.v
+++ b/cells/tap/sky130_fd_sc_ls__tap_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__tap cell (
+    sky130_fd_sc_ls__tap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__tap cell ();
+    sky130_fd_sc_ls__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.v b/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.v
index 319d473..1164d7d 100644
--- a/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.v
+++ b/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__tapmet1 cell (
+    sky130_fd_sc_ls__tapmet1 base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__tapmet1 cell ();
+    sky130_fd_sc_ls__tapmet1 base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.v b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.v
index df1b856..dd8c745 100644
--- a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.v
+++ b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.v
@@ -48,7 +48,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__tapvgnd cell (
+    sky130_fd_sc_ls__tapvgnd base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -81,7 +81,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__tapvgnd cell ();
+    sky130_fd_sc_ls__tapvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.v b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.v
index 2bc6dc9..14c0e03 100644
--- a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.v
+++ b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.v
@@ -48,7 +48,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__tapvgnd2 cell (
+    sky130_fd_sc_ls__tapvgnd2 base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -81,7 +81,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__tapvgnd2 cell ();
+    sky130_fd_sc_ls__tapvgnd2 base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.v b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.v
index 4ab4c00..f2c7c84 100644
--- a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.v
+++ b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__tapvgndnovpb cell (
+    sky130_fd_sc_ls__tapvgndnovpb base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__tapvgndnovpb cell ();
+    sky130_fd_sc_ls__tapvgndnovpb base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.v b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.v
index d0dbd37..2eae2dd 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ls__tapvpwrvgnd cell (
+    sky130_fd_sc_ls__tapvpwrvgnd base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__tapvpwrvgnd cell ();
+    sky130_fd_sc_ls__tapvpwrvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.v b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.v
index 6ef8fe2..fcf7dcf 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.v
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xnor2 cell (
+    sky130_fd_sc_ls__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xnor2 cell (
+    sky130_fd_sc_ls__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.v b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.v
index 5e49502..110d10e 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.v
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xnor2 cell (
+    sky130_fd_sc_ls__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xnor2 cell (
+    sky130_fd_sc_ls__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.v b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.v
index 302421e..a5f0d52 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.v
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xnor2 cell (
+    sky130_fd_sc_ls__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xnor2 cell (
+    sky130_fd_sc_ls__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.v b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.v
index bd39649..dbdb4c7 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.v
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xnor3 cell (
+    sky130_fd_sc_ls__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xnor3 cell (
+    sky130_fd_sc_ls__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.v b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.v
index 1fd1ddc..49d454e 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.v
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xnor3 cell (
+    sky130_fd_sc_ls__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xnor3 cell (
+    sky130_fd_sc_ls__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.v b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.v
index 23ca83d..79605b4 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.v
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xnor3 cell (
+    sky130_fd_sc_ls__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xnor3 cell (
+    sky130_fd_sc_ls__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_1.v b/cells/xor2/sky130_fd_sc_ls__xor2_1.v
index 6bafc0d..d34c2f3 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_1.v
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xor2 cell (
+    sky130_fd_sc_ls__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xor2 cell (
+    sky130_fd_sc_ls__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_2.v b/cells/xor2/sky130_fd_sc_ls__xor2_2.v
index d86ffee..b3bc6e5 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_2.v
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xor2 cell (
+    sky130_fd_sc_ls__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xor2 cell (
+    sky130_fd_sc_ls__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_4.v b/cells/xor2/sky130_fd_sc_ls__xor2_4.v
index 37924a6..e834989 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_4.v
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xor2 cell (
+    sky130_fd_sc_ls__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xor2 cell (
+    sky130_fd_sc_ls__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_1.v b/cells/xor3/sky130_fd_sc_ls__xor3_1.v
index a24b87e..da4c0b4 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_1.v
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xor3 cell (
+    sky130_fd_sc_ls__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xor3 cell (
+    sky130_fd_sc_ls__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_2.v b/cells/xor3/sky130_fd_sc_ls__xor3_2.v
index 859109b..12cfca4 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_2.v
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xor3 cell (
+    sky130_fd_sc_ls__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xor3 cell (
+    sky130_fd_sc_ls__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_4.v b/cells/xor3/sky130_fd_sc_ls__xor3_4.v
index 3539819..3237ec3 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_4.v
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ls__xor3 cell (
+    sky130_fd_sc_ls__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ls__xor3 cell (
+    sky130_fd_sc_ls__xor3 base (
         .X(X),
         .A(A),
         .B(B),