diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.v b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.v
index 70adc5f..4bda564 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.v
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2111o cell (
+    sky130_fd_sc_ms__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2111o cell (
+    sky130_fd_sc_ms__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.v b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.v
index 4d90b2e..f7e0407 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.v
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2111o cell (
+    sky130_fd_sc_ms__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2111o cell (
+    sky130_fd_sc_ms__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.v b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.v
index 0accc1b..7fe6da1 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.v
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2111o cell (
+    sky130_fd_sc_ms__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2111o cell (
+    sky130_fd_sc_ms__a2111o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.v b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.v
index 67f8593..850780d 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.v
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2111oi cell (
+    sky130_fd_sc_ms__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2111oi cell (
+    sky130_fd_sc_ms__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.v b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.v
index 5bbb370..0c6a9f1 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.v
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2111oi cell (
+    sky130_fd_sc_ms__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2111oi cell (
+    sky130_fd_sc_ms__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.v b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.v
index 4daa37d..ba578b8 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.v
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2111oi cell (
+    sky130_fd_sc_ms__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2111oi cell (
+    sky130_fd_sc_ms__a2111oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_1.v b/cells/a211o/sky130_fd_sc_ms__a211o_1.v
index f2f518b..0c2007b 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_1.v
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a211o cell (
+    sky130_fd_sc_ms__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a211o cell (
+    sky130_fd_sc_ms__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_2.v b/cells/a211o/sky130_fd_sc_ms__a211o_2.v
index 0fd224f..63bfc1a 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_2.v
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a211o cell (
+    sky130_fd_sc_ms__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a211o cell (
+    sky130_fd_sc_ms__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_4.v b/cells/a211o/sky130_fd_sc_ms__a211o_4.v
index 750f974..2b80629 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_4.v
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a211o cell (
+    sky130_fd_sc_ms__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a211o cell (
+    sky130_fd_sc_ms__a211o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.v b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.v
index a4d26f9..dc3308a 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.v
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a211oi cell (
+    sky130_fd_sc_ms__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a211oi cell (
+    sky130_fd_sc_ms__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.v b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.v
index b5861a6..7a1d0ca 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.v
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a211oi cell (
+    sky130_fd_sc_ms__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a211oi cell (
+    sky130_fd_sc_ms__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.v b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.v
index 0df7b3f..852ecc5 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.v
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a211oi cell (
+    sky130_fd_sc_ms__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a211oi cell (
+    sky130_fd_sc_ms__a211oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.v b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.v
index 4ff9c76..bdf4d33 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.v
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21bo cell (
+    sky130_fd_sc_ms__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21bo cell (
+    sky130_fd_sc_ms__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.v b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.v
index 7b0a8fe..4d44bba 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.v
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21bo cell (
+    sky130_fd_sc_ms__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21bo cell (
+    sky130_fd_sc_ms__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.v b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.v
index 464cd90..25b66d3 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.v
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21bo cell (
+    sky130_fd_sc_ms__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21bo cell (
+    sky130_fd_sc_ms__a21bo base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.v b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.v
index a7039d9..7225969 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.v
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21boi cell (
+    sky130_fd_sc_ms__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21boi cell (
+    sky130_fd_sc_ms__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.v b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.v
index 4adadd5..c5ac02c 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.v
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21boi cell (
+    sky130_fd_sc_ms__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21boi cell (
+    sky130_fd_sc_ms__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.v b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.v
index e79eeaa..585080f 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.v
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21boi cell (
+    sky130_fd_sc_ms__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21boi cell (
+    sky130_fd_sc_ms__a21boi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_1.v b/cells/a21o/sky130_fd_sc_ms__a21o_1.v
index 3e05b6f..2cb76cf 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_1.v
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21o cell (
+    sky130_fd_sc_ms__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21o cell (
+    sky130_fd_sc_ms__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_2.v b/cells/a21o/sky130_fd_sc_ms__a21o_2.v
index 97bb1d3..653afba 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_2.v
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21o cell (
+    sky130_fd_sc_ms__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21o cell (
+    sky130_fd_sc_ms__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_4.v b/cells/a21o/sky130_fd_sc_ms__a21o_4.v
index f2f7317..9538714 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_4.v
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21o cell (
+    sky130_fd_sc_ms__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21o cell (
+    sky130_fd_sc_ms__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.v b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.v
index b3475ca..a96f45b 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.v
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21oi cell (
+    sky130_fd_sc_ms__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21oi cell (
+    sky130_fd_sc_ms__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.v b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.v
index 689d23f..088e16f 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.v
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21oi cell (
+    sky130_fd_sc_ms__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21oi cell (
+    sky130_fd_sc_ms__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.v b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.v
index dd3d803..72f80f1 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.v
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a21oi cell (
+    sky130_fd_sc_ms__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a21oi cell (
+    sky130_fd_sc_ms__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_1.v b/cells/a221o/sky130_fd_sc_ms__a221o_1.v
index 5dc544a..02d99b4 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_1.v
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a221o cell (
+    sky130_fd_sc_ms__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a221o cell (
+    sky130_fd_sc_ms__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_2.v b/cells/a221o/sky130_fd_sc_ms__a221o_2.v
index 52dd4d7..9937d5d 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_2.v
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a221o cell (
+    sky130_fd_sc_ms__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a221o cell (
+    sky130_fd_sc_ms__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_4.v b/cells/a221o/sky130_fd_sc_ms__a221o_4.v
index c7a1d6c..e6cfab8 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_4.v
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a221o cell (
+    sky130_fd_sc_ms__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a221o cell (
+    sky130_fd_sc_ms__a221o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.v b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.v
index b768cf5..9e27d0a 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.v
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a221oi cell (
+    sky130_fd_sc_ms__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a221oi cell (
+    sky130_fd_sc_ms__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.v b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.v
index a076357..5786afc 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.v
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a221oi cell (
+    sky130_fd_sc_ms__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a221oi cell (
+    sky130_fd_sc_ms__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.v b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.v
index 555d6b1..ee35963 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.v
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a221oi cell (
+    sky130_fd_sc_ms__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a221oi cell (
+    sky130_fd_sc_ms__a221oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_1.v b/cells/a222o/sky130_fd_sc_ms__a222o_1.v
index d59a2e4..727a4ea 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_1.v
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_1.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a222o cell (
+    sky130_fd_sc_ms__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a222o cell (
+    sky130_fd_sc_ms__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_2.v b/cells/a222o/sky130_fd_sc_ms__a222o_2.v
index 12444d4..464f981 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_2.v
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_2.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a222o cell (
+    sky130_fd_sc_ms__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a222o cell (
+    sky130_fd_sc_ms__a222o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.v b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.v
index 35710d9..f7c416e 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.v
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a222oi cell (
+    sky130_fd_sc_ms__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a222oi cell (
+    sky130_fd_sc_ms__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.v b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.v
index 6bdb060..8ef36e7 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.v
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.v
@@ -63,7 +63,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a222oi cell (
+    sky130_fd_sc_ms__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -117,7 +117,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a222oi cell (
+    sky130_fd_sc_ms__a222oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_1.v b/cells/a22o/sky130_fd_sc_ms__a22o_1.v
index 0d05344..f93e2ac 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_1.v
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a22o cell (
+    sky130_fd_sc_ms__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a22o cell (
+    sky130_fd_sc_ms__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_2.v b/cells/a22o/sky130_fd_sc_ms__a22o_2.v
index 3f467c3..1c7bf34 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_2.v
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a22o cell (
+    sky130_fd_sc_ms__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a22o cell (
+    sky130_fd_sc_ms__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_4.v b/cells/a22o/sky130_fd_sc_ms__a22o_4.v
index 3745b1f..13cc2d3 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_4.v
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a22o cell (
+    sky130_fd_sc_ms__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a22o cell (
+    sky130_fd_sc_ms__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.v b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.v
index 9e2d409..07a81a9 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.v
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a22oi cell (
+    sky130_fd_sc_ms__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a22oi cell (
+    sky130_fd_sc_ms__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.v b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.v
index 579e4c1..a60cd96 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.v
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a22oi cell (
+    sky130_fd_sc_ms__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a22oi cell (
+    sky130_fd_sc_ms__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.v b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.v
index a53c35e..5481d23 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.v
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a22oi cell (
+    sky130_fd_sc_ms__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a22oi cell (
+    sky130_fd_sc_ms__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.v b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.v
index 5a2f7ff..7e575b0 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.v
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2bb2o cell (
+    sky130_fd_sc_ms__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2bb2o cell (
+    sky130_fd_sc_ms__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.v b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.v
index 69e2df4..2108479 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.v
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2bb2o cell (
+    sky130_fd_sc_ms__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2bb2o cell (
+    sky130_fd_sc_ms__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.v b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.v
index 538e5d7..b877499 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.v
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2bb2o cell (
+    sky130_fd_sc_ms__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2bb2o cell (
+    sky130_fd_sc_ms__a2bb2o base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.v b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.v
index 4ab96ea..bfbffd2 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.v
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2bb2oi cell (
+    sky130_fd_sc_ms__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2bb2oi cell (
+    sky130_fd_sc_ms__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.v b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.v
index 88b2401..7cb247e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.v
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2bb2oi cell (
+    sky130_fd_sc_ms__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2bb2oi cell (
+    sky130_fd_sc_ms__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.v b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.v
index 895a5d4..2178b20 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.v
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a2bb2oi cell (
+    sky130_fd_sc_ms__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -108,7 +108,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a2bb2oi cell (
+    sky130_fd_sc_ms__a2bb2oi base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_1.v b/cells/a311o/sky130_fd_sc_ms__a311o_1.v
index 3954af4..5cd3ebf 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_1.v
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a311o cell (
+    sky130_fd_sc_ms__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a311o cell (
+    sky130_fd_sc_ms__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_2.v b/cells/a311o/sky130_fd_sc_ms__a311o_2.v
index 7aa43d0..20d0cdb 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_2.v
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a311o cell (
+    sky130_fd_sc_ms__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a311o cell (
+    sky130_fd_sc_ms__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_4.v b/cells/a311o/sky130_fd_sc_ms__a311o_4.v
index 67a7f5a..eeddf5c 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_4.v
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a311o cell (
+    sky130_fd_sc_ms__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a311o cell (
+    sky130_fd_sc_ms__a311o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.v b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.v
index a490ff2..1adeede 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.v
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a311oi cell (
+    sky130_fd_sc_ms__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a311oi cell (
+    sky130_fd_sc_ms__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.v b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.v
index 2450a91..fb7dcbc 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.v
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a311oi cell (
+    sky130_fd_sc_ms__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a311oi cell (
+    sky130_fd_sc_ms__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.v b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.v
index 07b28fc..94b2c1d 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.v
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a311oi cell (
+    sky130_fd_sc_ms__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a311oi cell (
+    sky130_fd_sc_ms__a311oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_1.v b/cells/a31o/sky130_fd_sc_ms__a31o_1.v
index 30a6dd3..552daec 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_1.v
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a31o cell (
+    sky130_fd_sc_ms__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a31o cell (
+    sky130_fd_sc_ms__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_2.v b/cells/a31o/sky130_fd_sc_ms__a31o_2.v
index 83b78a9..e026bd2 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_2.v
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a31o cell (
+    sky130_fd_sc_ms__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a31o cell (
+    sky130_fd_sc_ms__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_4.v b/cells/a31o/sky130_fd_sc_ms__a31o_4.v
index 979ae4c..070ac89 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_4.v
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a31o cell (
+    sky130_fd_sc_ms__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a31o cell (
+    sky130_fd_sc_ms__a31o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.v b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.v
index 67e1de4..d12aa23 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.v
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a31oi cell (
+    sky130_fd_sc_ms__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a31oi cell (
+    sky130_fd_sc_ms__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.v b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.v
index 647d254..100be90 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.v
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a31oi cell (
+    sky130_fd_sc_ms__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a31oi cell (
+    sky130_fd_sc_ms__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.v b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.v
index 3060ff6..28b978c 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.v
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a31oi cell (
+    sky130_fd_sc_ms__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a31oi cell (
+    sky130_fd_sc_ms__a31oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_1.v b/cells/a32o/sky130_fd_sc_ms__a32o_1.v
index 847e49d..6f2c736 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_1.v
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a32o cell (
+    sky130_fd_sc_ms__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a32o cell (
+    sky130_fd_sc_ms__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_2.v b/cells/a32o/sky130_fd_sc_ms__a32o_2.v
index 020eefe..33e92ea 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_2.v
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a32o cell (
+    sky130_fd_sc_ms__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a32o cell (
+    sky130_fd_sc_ms__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_4.v b/cells/a32o/sky130_fd_sc_ms__a32o_4.v
index 803aba2..46e68d3 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_4.v
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a32o cell (
+    sky130_fd_sc_ms__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a32o cell (
+    sky130_fd_sc_ms__a32o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.v b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.v
index a6fb990..64d6951 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.v
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a32oi cell (
+    sky130_fd_sc_ms__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a32oi cell (
+    sky130_fd_sc_ms__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.v b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.v
index 02abbcc..00ac2ef 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.v
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a32oi cell (
+    sky130_fd_sc_ms__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a32oi cell (
+    sky130_fd_sc_ms__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.v b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.v
index 5df94f3..c09e212 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.v
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a32oi cell (
+    sky130_fd_sc_ms__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -113,7 +113,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a32oi cell (
+    sky130_fd_sc_ms__a32oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_1.v b/cells/a41o/sky130_fd_sc_ms__a41o_1.v
index 6a2a288..fdc1145 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_1.v
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a41o cell (
+    sky130_fd_sc_ms__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a41o cell (
+    sky130_fd_sc_ms__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_2.v b/cells/a41o/sky130_fd_sc_ms__a41o_2.v
index d92b74d..af02b84 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_2.v
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a41o cell (
+    sky130_fd_sc_ms__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a41o cell (
+    sky130_fd_sc_ms__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_4.v b/cells/a41o/sky130_fd_sc_ms__a41o_4.v
index f30d9ad..fa1b0fe 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_4.v
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a41o cell (
+    sky130_fd_sc_ms__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a41o cell (
+    sky130_fd_sc_ms__a41o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.v b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.v
index 79f915d..4bde755 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.v
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a41oi cell (
+    sky130_fd_sc_ms__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a41oi cell (
+    sky130_fd_sc_ms__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.v b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.v
index 8d000e8..982a9ad 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.v
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a41oi cell (
+    sky130_fd_sc_ms__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a41oi cell (
+    sky130_fd_sc_ms__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.v b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.v
index 8630cce..fd9b5ba 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.v
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__a41oi cell (
+    sky130_fd_sc_ms__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__a41oi cell (
+    sky130_fd_sc_ms__a41oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/and2/sky130_fd_sc_ms__and2_1.v b/cells/and2/sky130_fd_sc_ms__and2_1.v
index 7b1652e..a62db96 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_1.v
+++ b/cells/and2/sky130_fd_sc_ms__and2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and2 cell (
+    sky130_fd_sc_ms__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and2 cell (
+    sky130_fd_sc_ms__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_ms__and2_2.v b/cells/and2/sky130_fd_sc_ms__and2_2.v
index e22253a..d4b0901 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_2.v
+++ b/cells/and2/sky130_fd_sc_ms__and2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and2 cell (
+    sky130_fd_sc_ms__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and2 cell (
+    sky130_fd_sc_ms__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2/sky130_fd_sc_ms__and2_4.v b/cells/and2/sky130_fd_sc_ms__and2_4.v
index f0c14ee..6a016c5 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_4.v
+++ b/cells/and2/sky130_fd_sc_ms__and2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and2 cell (
+    sky130_fd_sc_ms__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and2 cell (
+    sky130_fd_sc_ms__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_1.v b/cells/and2b/sky130_fd_sc_ms__and2b_1.v
index 0393214..eb2d391 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_1.v
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and2b cell (
+    sky130_fd_sc_ms__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and2b cell (
+    sky130_fd_sc_ms__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_2.v b/cells/and2b/sky130_fd_sc_ms__and2b_2.v
index a008fc7..fc28ea7 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_2.v
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and2b cell (
+    sky130_fd_sc_ms__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and2b cell (
+    sky130_fd_sc_ms__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_4.v b/cells/and2b/sky130_fd_sc_ms__and2b_4.v
index e6807de..3e4aded 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_4.v
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and2b cell (
+    sky130_fd_sc_ms__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and2b cell (
+    sky130_fd_sc_ms__and2b base (
         .X(X),
         .A_N(A_N),
         .B(B)
diff --git a/cells/and3/sky130_fd_sc_ms__and3_1.v b/cells/and3/sky130_fd_sc_ms__and3_1.v
index fda68ef..10de071 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_1.v
+++ b/cells/and3/sky130_fd_sc_ms__and3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and3 cell (
+    sky130_fd_sc_ms__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and3 cell (
+    sky130_fd_sc_ms__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_ms__and3_2.v b/cells/and3/sky130_fd_sc_ms__and3_2.v
index 0f0a706..0920628 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_2.v
+++ b/cells/and3/sky130_fd_sc_ms__and3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and3 cell (
+    sky130_fd_sc_ms__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and3 cell (
+    sky130_fd_sc_ms__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3/sky130_fd_sc_ms__and3_4.v b/cells/and3/sky130_fd_sc_ms__and3_4.v
index c2a0431..a0043c2 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_4.v
+++ b/cells/and3/sky130_fd_sc_ms__and3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and3 cell (
+    sky130_fd_sc_ms__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and3 cell (
+    sky130_fd_sc_ms__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_1.v b/cells/and3b/sky130_fd_sc_ms__and3b_1.v
index e39af15..ccbf85e 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_1.v
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and3b cell (
+    sky130_fd_sc_ms__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and3b cell (
+    sky130_fd_sc_ms__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_2.v b/cells/and3b/sky130_fd_sc_ms__and3b_2.v
index b0e5fe6..3e61234 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_2.v
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and3b cell (
+    sky130_fd_sc_ms__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and3b cell (
+    sky130_fd_sc_ms__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_4.v b/cells/and3b/sky130_fd_sc_ms__and3b_4.v
index 7471967..1bdbec9 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_4.v
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and3b cell (
+    sky130_fd_sc_ms__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and3b cell (
+    sky130_fd_sc_ms__and3b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_ms__and4_1.v b/cells/and4/sky130_fd_sc_ms__and4_1.v
index 05fb968..73d737c 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_1.v
+++ b/cells/and4/sky130_fd_sc_ms__and4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4 cell (
+    sky130_fd_sc_ms__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4 cell (
+    sky130_fd_sc_ms__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_ms__and4_2.v b/cells/and4/sky130_fd_sc_ms__and4_2.v
index f8de473..b7044b3 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_2.v
+++ b/cells/and4/sky130_fd_sc_ms__and4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4 cell (
+    sky130_fd_sc_ms__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4 cell (
+    sky130_fd_sc_ms__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4/sky130_fd_sc_ms__and4_4.v b/cells/and4/sky130_fd_sc_ms__and4_4.v
index bafb192..9338a7c 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_4.v
+++ b/cells/and4/sky130_fd_sc_ms__and4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4 cell (
+    sky130_fd_sc_ms__and4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4 cell (
+    sky130_fd_sc_ms__and4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_1.v b/cells/and4b/sky130_fd_sc_ms__and4b_1.v
index 7a6f102..2e3c735 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_1.v
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4b cell (
+    sky130_fd_sc_ms__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4b cell (
+    sky130_fd_sc_ms__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_2.v b/cells/and4b/sky130_fd_sc_ms__and4b_2.v
index 5299a21..8a4e2c9 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_2.v
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4b cell (
+    sky130_fd_sc_ms__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4b cell (
+    sky130_fd_sc_ms__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_4.v b/cells/and4b/sky130_fd_sc_ms__and4b_4.v
index d2083cb..7ec780b 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_4.v
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4b cell (
+    sky130_fd_sc_ms__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4b cell (
+    sky130_fd_sc_ms__and4b base (
         .X(X),
         .A_N(A_N),
         .B(B),
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.v b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.v
index 093e207..c101e16 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.v
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4bb cell (
+    sky130_fd_sc_ms__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4bb cell (
+    sky130_fd_sc_ms__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.v b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.v
index 3ad0221..811782b 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.v
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4bb cell (
+    sky130_fd_sc_ms__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4bb cell (
+    sky130_fd_sc_ms__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.v b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.v
index aa06a45..c783089 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.v
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__and4bb cell (
+    sky130_fd_sc_ms__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__and4bb cell (
+    sky130_fd_sc_ms__and4bb base (
         .X(X),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/buf/sky130_fd_sc_ms__buf_1.v b/cells/buf/sky130_fd_sc_ms__buf_1.v
index b71bb7a..ce1315b 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_1.v
+++ b/cells/buf/sky130_fd_sc_ms__buf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_ms__buf_16.v b/cells/buf/sky130_fd_sc_ms__buf_16.v
index 9b67381..2cb4738 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_16.v
+++ b/cells/buf/sky130_fd_sc_ms__buf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_ms__buf_2.v b/cells/buf/sky130_fd_sc_ms__buf_2.v
index 1f7ab9a..8a68bfa 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_2.v
+++ b/cells/buf/sky130_fd_sc_ms__buf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_ms__buf_4.v b/cells/buf/sky130_fd_sc_ms__buf_4.v
index f636fbc..be8d242 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_4.v
+++ b/cells/buf/sky130_fd_sc_ms__buf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_ms__buf_8.v b/cells/buf/sky130_fd_sc_ms__buf_8.v
index 85f0357..7eaa772 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_8.v
+++ b/cells/buf/sky130_fd_sc_ms__buf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__buf cell (
+    sky130_fd_sc_ms__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.v b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.v
index 72cc7c3..ac5400e 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.v
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__bufbuf cell (
+    sky130_fd_sc_ms__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__bufbuf cell (
+    sky130_fd_sc_ms__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.v b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.v
index 745a007..6043e62 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.v
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__bufbuf cell (
+    sky130_fd_sc_ms__bufbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__bufbuf cell (
+    sky130_fd_sc_ms__bufbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.v b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.v
index 73b602d..5730da9 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.v
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__bufinv cell (
+    sky130_fd_sc_ms__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__bufinv cell (
+    sky130_fd_sc_ms__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.v b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.v
index 9826cb4..8ff7549 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.v
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__bufinv cell (
+    sky130_fd_sc_ms__bufinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__bufinv cell (
+    sky130_fd_sc_ms__bufinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.v b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.v
index 3173652..124eb68 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.v
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.v b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.v
index 45380bd..4415c6d 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.v
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.v b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.v
index b9f0a85..3f5fcff 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.v
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.v b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.v
index d624b46..7057f24 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.v
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.v b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.v
index 6ab10c9..ec1b729 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.v
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkbuf cell (
+    sky130_fd_sc_ms__clkbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.v b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.v
index 35da231..64bc90c 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.v
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkdlyinv3sd1 cell (
+    sky130_fd_sc_ms__clkdlyinv3sd1 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkdlyinv3sd1 cell (
+    sky130_fd_sc_ms__clkdlyinv3sd1 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.v b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.v
index 993c27d..50d2f25 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.v
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkdlyinv3sd2 cell (
+    sky130_fd_sc_ms__clkdlyinv3sd2 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkdlyinv3sd2 cell (
+    sky130_fd_sc_ms__clkdlyinv3sd2 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.v b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.v
index 9a689cd..847b5ec 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.v
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkdlyinv3sd3 cell (
+    sky130_fd_sc_ms__clkdlyinv3sd3 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkdlyinv3sd3 cell (
+    sky130_fd_sc_ms__clkdlyinv3sd3 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.v b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.v
index b213960..3a5117a 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.v
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkdlyinv5sd1 cell (
+    sky130_fd_sc_ms__clkdlyinv5sd1 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkdlyinv5sd1 cell (
+    sky130_fd_sc_ms__clkdlyinv5sd1 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.v b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.v
index e19e892..361b395 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.v
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkdlyinv5sd2 cell (
+    sky130_fd_sc_ms__clkdlyinv5sd2 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkdlyinv5sd2 cell (
+    sky130_fd_sc_ms__clkdlyinv5sd2 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.v b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.v
index 4641bd9..7ffb33c 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.v
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkdlyinv5sd3 cell (
+    sky130_fd_sc_ms__clkdlyinv5sd3 base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkdlyinv5sd3 cell (
+    sky130_fd_sc_ms__clkdlyinv5sd3 base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.v b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.v
index ff7885e..1590186 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.v
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.v b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.v
index 6db4002..c9493fe 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.v
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.v b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.v
index f633c3f..ef4d62c 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.v
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.v b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.v
index aefa996..8b6940c 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.v
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.v b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.v
index b9f6371..63acc7f 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.v
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__clkinv cell (
+    sky130_fd_sc_ms__clkinv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/conb/sky130_fd_sc_ms__conb_1.v b/cells/conb/sky130_fd_sc_ms__conb_1.v
index 36cd556..d82bcdd 100644
--- a/cells/conb/sky130_fd_sc_ms__conb_1.v
+++ b/cells/conb/sky130_fd_sc_ms__conb_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__conb cell (
+    sky130_fd_sc_ms__conb base (
         .HI(HI),
         .LO(LO),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__conb cell (
+    sky130_fd_sc_ms__conb base (
         .HI(HI),
         .LO(LO)
     );
diff --git a/cells/decap/sky130_fd_sc_ms__decap_4.v b/cells/decap/sky130_fd_sc_ms__decap_4.v
index c4b01d1..897838c 100644
--- a/cells/decap/sky130_fd_sc_ms__decap_4.v
+++ b/cells/decap/sky130_fd_sc_ms__decap_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__decap cell (
+    sky130_fd_sc_ms__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__decap cell ();
+    sky130_fd_sc_ms__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_ms__decap_8.v b/cells/decap/sky130_fd_sc_ms__decap_8.v
index ac204dd..255f456 100644
--- a/cells/decap/sky130_fd_sc_ms__decap_8.v
+++ b/cells/decap/sky130_fd_sc_ms__decap_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__decap cell (
+    sky130_fd_sc_ms__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__decap cell ();
+    sky130_fd_sc_ms__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.v b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.v
index 00351d4..430fed1 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.v
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfbbn cell (
+    sky130_fd_sc_ms__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfbbn cell (
+    sky130_fd_sc_ms__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.v b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.v
index 5dcfb79..a40fc90 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.v
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfbbn cell (
+    sky130_fd_sc_ms__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfbbn cell (
+    sky130_fd_sc_ms__dfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.v b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.v
index 9d9bde2..db35031 100644
--- a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.v
+++ b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfbbp cell (
+    sky130_fd_sc_ms__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfbbp cell (
+    sky130_fd_sc_ms__dfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.v b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.v
index dc2ddee..0a71ae4 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.v
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfrbp cell (
+    sky130_fd_sc_ms__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfrbp cell (
+    sky130_fd_sc_ms__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.v b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.v
index 1abf708..3d87715 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.v
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfrbp cell (
+    sky130_fd_sc_ms__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfrbp cell (
+    sky130_fd_sc_ms__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.v b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.v
index 7cfe80a..370f3a4 100644
--- a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.v
+++ b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfrtn cell (
+    sky130_fd_sc_ms__dfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfrtn cell (
+    sky130_fd_sc_ms__dfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.v b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.v
index 0ef7a65..af039a9 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.v
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfrtp cell (
+    sky130_fd_sc_ms__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfrtp cell (
+    sky130_fd_sc_ms__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.v b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.v
index e753f8b..719d14b 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.v
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfrtp cell (
+    sky130_fd_sc_ms__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfrtp cell (
+    sky130_fd_sc_ms__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.v b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.v
index 4862d75..4d3df2d 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.v
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dfrtp cell (
+    sky130_fd_sc_ms__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfrtp cell (
+    sky130_fd_sc_ms__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.v b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.v
index b4db518..68b4202 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.v
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__dfsbp cell (
+    sky130_fd_sc_ms__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfsbp cell (
+    sky130_fd_sc_ms__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.v b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.v
index 989cf41..b259963 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.v
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__dfsbp cell (
+    sky130_fd_sc_ms__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfsbp cell (
+    sky130_fd_sc_ms__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.v b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.v
index c75e370..8612400 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.v
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__dfstp cell (
+    sky130_fd_sc_ms__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfstp cell (
+    sky130_fd_sc_ms__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.v b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.v
index 5b7f694..9a1581b 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.v
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__dfstp cell (
+    sky130_fd_sc_ms__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfstp cell (
+    sky130_fd_sc_ms__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.v b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.v
index dfacd7a..f8eadd1 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.v
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__dfstp cell (
+    sky130_fd_sc_ms__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfstp cell (
+    sky130_fd_sc_ms__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.v b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.v
index 2805254..0c2b454 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.v
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dfxbp cell (
+    sky130_fd_sc_ms__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfxbp cell (
+    sky130_fd_sc_ms__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.v b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.v
index cd2f1ae..95cad84 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.v
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dfxbp cell (
+    sky130_fd_sc_ms__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfxbp cell (
+    sky130_fd_sc_ms__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.v b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.v
index f0ddafb..9f388d6 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.v
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dfxtp cell (
+    sky130_fd_sc_ms__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfxtp cell (
+    sky130_fd_sc_ms__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.v b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.v
index 943ccfd..b8a9fde 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.v
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dfxtp cell (
+    sky130_fd_sc_ms__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfxtp cell (
+    sky130_fd_sc_ms__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.v b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.v
index 0466194..7049fce 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.v
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dfxtp cell (
+    sky130_fd_sc_ms__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dfxtp cell (
+    sky130_fd_sc_ms__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/diode/sky130_fd_sc_ms__diode_2.v b/cells/diode/sky130_fd_sc_ms__diode_2.v
index 41b2a44..53ffc43 100644
--- a/cells/diode/sky130_fd_sc_ms__diode_2.v
+++ b/cells/diode/sky130_fd_sc_ms__diode_2.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_ms__diode cell (
+    sky130_fd_sc_ms__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__diode cell (
+    sky130_fd_sc_ms__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.v b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.v
index c7c4bc9..0d08296 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.v
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlclkp cell (
+    sky130_fd_sc_ms__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlclkp cell (
+    sky130_fd_sc_ms__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.v b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.v
index 0a8b7d9..df39b23 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.v
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlclkp cell (
+    sky130_fd_sc_ms__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlclkp cell (
+    sky130_fd_sc_ms__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.v b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.v
index eb85a9c..6ed8985 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.v
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlclkp cell (
+    sky130_fd_sc_ms__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlclkp cell (
+    sky130_fd_sc_ms__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.v b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.v
index 8361af1..43d7acb 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.v
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrbn cell (
+    sky130_fd_sc_ms__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrbn cell (
+    sky130_fd_sc_ms__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.v b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.v
index 70b1137..beb9fed 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.v
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrbn cell (
+    sky130_fd_sc_ms__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrbn cell (
+    sky130_fd_sc_ms__dlrbn base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.v b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.v
index 3ef2b33..b779804 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.v
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrbp cell (
+    sky130_fd_sc_ms__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrbp cell (
+    sky130_fd_sc_ms__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.v b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.v
index d7ea2cf..780b840 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.v
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.v
@@ -58,7 +58,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrbp cell (
+    sky130_fd_sc_ms__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrbp cell (
+    sky130_fd_sc_ms__dlrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .RESET_B(RESET_B),
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.v b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.v
index fef0ce6..6326005 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.v
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrtn cell (
+    sky130_fd_sc_ms__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrtn cell (
+    sky130_fd_sc_ms__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.v b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.v
index 3fbdfae..0077b7d 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.v
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrtn cell (
+    sky130_fd_sc_ms__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrtn cell (
+    sky130_fd_sc_ms__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.v b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.v
index b7551d4..08c9e57 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.v
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrtn cell (
+    sky130_fd_sc_ms__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrtn cell (
+    sky130_fd_sc_ms__dlrtn base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.v b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.v
index 464632e..acd8a8c 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.v
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrtp cell (
+    sky130_fd_sc_ms__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrtp cell (
+    sky130_fd_sc_ms__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.v b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.v
index b6db7c7..e8afe90 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.v
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrtp cell (
+    sky130_fd_sc_ms__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrtp cell (
+    sky130_fd_sc_ms__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.v b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.v
index 41735d3..32ebe83 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.v
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__dlrtp cell (
+    sky130_fd_sc_ms__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlrtp cell (
+    sky130_fd_sc_ms__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.v b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.v
index 19d6b72..f270275 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.v
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.v
@@ -55,7 +55,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ms__dlxbn cell (
+    sky130_fd_sc_ms__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlxbn cell (
+    sky130_fd_sc_ms__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.v b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.v
index d5ea431..9f41def 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.v
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.v
@@ -55,7 +55,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ms__dlxbn cell (
+    sky130_fd_sc_ms__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlxbn cell (
+    sky130_fd_sc_ms__dlxbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.v b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.v
index cf94e95..5f51df6 100644
--- a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.v
+++ b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlxbp cell (
+    sky130_fd_sc_ms__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlxbp cell (
+    sky130_fd_sc_ms__dlxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.v b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.v
index 9894968..bbc62a7 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.v
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ms__dlxtn cell (
+    sky130_fd_sc_ms__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlxtn cell (
+    sky130_fd_sc_ms__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.v b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.v
index dd3655f..d24b4d8 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.v
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ms__dlxtn cell (
+    sky130_fd_sc_ms__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlxtn cell (
+    sky130_fd_sc_ms__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.v b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.v
index 5a60281..89dfe81 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.v
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.v
@@ -53,7 +53,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ms__dlxtn cell (
+    sky130_fd_sc_ms__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlxtn cell (
+    sky130_fd_sc_ms__dlxtn base (
         .Q(Q),
         .D(D),
         .GATE_N(GATE_N)
diff --git a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.v b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.v
index 92dcb22..23f76a2 100644
--- a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.v
+++ b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlxtp cell (
+    sky130_fd_sc_ms__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlxtp cell (
+    sky130_fd_sc_ms__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE)
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.v b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.v
index 048e3ce..1bffc51 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlygate4sd1 cell (
+    sky130_fd_sc_ms__dlygate4sd1 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlygate4sd1 cell (
+    sky130_fd_sc_ms__dlygate4sd1 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.v b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.v
index 7b5fcd6..c73bdf8 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlygate4sd2 cell (
+    sky130_fd_sc_ms__dlygate4sd2 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlygate4sd2 cell (
+    sky130_fd_sc_ms__dlygate4sd2 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.v b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.v
index f6f9371..40c5bd0 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlygate4sd3 cell (
+    sky130_fd_sc_ms__dlygate4sd3 base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlygate4sd3 cell (
+    sky130_fd_sc_ms__dlygate4sd3 base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.v b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.v
index 78b7d22..a215822 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlymetal6s2s cell (
+    sky130_fd_sc_ms__dlymetal6s2s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlymetal6s2s cell (
+    sky130_fd_sc_ms__dlymetal6s2s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.v b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.v
index 8914cff..6b0d25e 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlymetal6s4s cell (
+    sky130_fd_sc_ms__dlymetal6s4s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlymetal6s4s cell (
+    sky130_fd_sc_ms__dlymetal6s4s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.v b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.v
index d86b5e6..38548ed 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.v
@@ -52,7 +52,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__dlymetal6s6s cell (
+    sky130_fd_sc_ms__dlymetal6s6s base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -91,7 +91,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__dlymetal6s6s cell (
+    sky130_fd_sc_ms__dlymetal6s6s base (
         .X(X),
         .A(A)
     );
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.v b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.v
index ef2b948..20e892e 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.v
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__ebufn cell (
+    sky130_fd_sc_ms__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__ebufn cell (
+    sky130_fd_sc_ms__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.v b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.v
index 01041c8..098b848 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.v
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__ebufn cell (
+    sky130_fd_sc_ms__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__ebufn cell (
+    sky130_fd_sc_ms__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.v b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.v
index bbb97e3..a717e0e 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.v
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__ebufn cell (
+    sky130_fd_sc_ms__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__ebufn cell (
+    sky130_fd_sc_ms__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.v b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.v
index d833456..39fb03b 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.v
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__ebufn cell (
+    sky130_fd_sc_ms__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__ebufn cell (
+    sky130_fd_sc_ms__ebufn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.v b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.v
index e979c76..bead12d 100644
--- a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.v
+++ b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__edfxbp cell (
+    sky130_fd_sc_ms__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -106,7 +106,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__edfxbp cell (
+    sky130_fd_sc_ms__edfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.v b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.v
index 230809a..c93fe59 100644
--- a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.v
+++ b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.v
@@ -56,7 +56,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__edfxtp cell (
+    sky130_fd_sc_ms__edfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__edfxtp cell (
+    sky130_fd_sc_ms__edfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_1.v b/cells/einvn/sky130_fd_sc_ms__einvn_1.v
index 8a6e5b3..81faba0 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_1.v
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__einvn cell (
+    sky130_fd_sc_ms__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__einvn cell (
+    sky130_fd_sc_ms__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_2.v b/cells/einvn/sky130_fd_sc_ms__einvn_2.v
index c053c86..c47db14 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_2.v
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__einvn cell (
+    sky130_fd_sc_ms__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__einvn cell (
+    sky130_fd_sc_ms__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_4.v b/cells/einvn/sky130_fd_sc_ms__einvn_4.v
index 8dde3d1..14a6c96 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_4.v
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__einvn cell (
+    sky130_fd_sc_ms__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__einvn cell (
+    sky130_fd_sc_ms__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_8.v b/cells/einvn/sky130_fd_sc_ms__einvn_8.v
index 0ffeb40..5b38435 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_8.v
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__einvn cell (
+    sky130_fd_sc_ms__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__einvn cell (
+    sky130_fd_sc_ms__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_1.v b/cells/einvp/sky130_fd_sc_ms__einvp_1.v
index c03878a..cf190cf 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_1.v
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__einvp cell (
+    sky130_fd_sc_ms__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__einvp cell (
+    sky130_fd_sc_ms__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_2.v b/cells/einvp/sky130_fd_sc_ms__einvp_2.v
index 02485b0..ccd924e 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_2.v
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__einvp cell (
+    sky130_fd_sc_ms__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__einvp cell (
+    sky130_fd_sc_ms__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_4.v b/cells/einvp/sky130_fd_sc_ms__einvp_4.v
index a5db094..56d946e 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_4.v
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__einvp cell (
+    sky130_fd_sc_ms__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__einvp cell (
+    sky130_fd_sc_ms__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_8.v b/cells/einvp/sky130_fd_sc_ms__einvp_8.v
index bb12c54..53d9fca 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_8.v
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__einvp cell (
+    sky130_fd_sc_ms__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__einvp cell (
+    sky130_fd_sc_ms__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/fa/sky130_fd_sc_ms__fa_1.v b/cells/fa/sky130_fd_sc_ms__fa_1.v
index 461bf85..df2d06c 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_1.v
+++ b/cells/fa/sky130_fd_sc_ms__fa_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__fa cell (
+    sky130_fd_sc_ms__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fa cell (
+    sky130_fd_sc_ms__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_ms__fa_2.v b/cells/fa/sky130_fd_sc_ms__fa_2.v
index 39187e7..9655974 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_2.v
+++ b/cells/fa/sky130_fd_sc_ms__fa_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__fa cell (
+    sky130_fd_sc_ms__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fa cell (
+    sky130_fd_sc_ms__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fa/sky130_fd_sc_ms__fa_4.v b/cells/fa/sky130_fd_sc_ms__fa_4.v
index c334cc0..31078f3 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_4.v
+++ b/cells/fa/sky130_fd_sc_ms__fa_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__fa cell (
+    sky130_fd_sc_ms__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fa cell (
+    sky130_fd_sc_ms__fa base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_ms__fah_1.v b/cells/fah/sky130_fd_sc_ms__fah_1.v
index 4bb14df..c675819 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_1.v
+++ b/cells/fah/sky130_fd_sc_ms__fah_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__fah cell (
+    sky130_fd_sc_ms__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fah cell (
+    sky130_fd_sc_ms__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_ms__fah_2.v b/cells/fah/sky130_fd_sc_ms__fah_2.v
index 97803e8..40e8a8a 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_2.v
+++ b/cells/fah/sky130_fd_sc_ms__fah_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__fah cell (
+    sky130_fd_sc_ms__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fah cell (
+    sky130_fd_sc_ms__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fah/sky130_fd_sc_ms__fah_4.v b/cells/fah/sky130_fd_sc_ms__fah_4.v
index 5d61b81..595fa17 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_4.v
+++ b/cells/fah/sky130_fd_sc_ms__fah_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__fah cell (
+    sky130_fd_sc_ms__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fah cell (
+    sky130_fd_sc_ms__fah base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.v b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.v
index 82b3287..14f1c3e 100644
--- a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.v
+++ b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__fahcin cell (
+    sky130_fd_sc_ms__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fahcin cell (
+    sky130_fd_sc_ms__fahcin base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.v b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.v
index 5de5e15..9effb84 100644
--- a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.v
+++ b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.v
@@ -57,7 +57,7 @@
     input  VGND  ;
     input  VPB   ;
     input  VNB   ;
-    sky130_fd_sc_ms__fahcon cell (
+    sky130_fd_sc_ms__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fahcon cell (
+    sky130_fd_sc_ms__fahcon base (
         .COUT_N(COUT_N),
         .SUM(SUM),
         .A(A),
diff --git a/cells/fill/sky130_fd_sc_ms__fill_1.v b/cells/fill/sky130_fd_sc_ms__fill_1.v
index 7a70815..6507de6 100644
--- a/cells/fill/sky130_fd_sc_ms__fill_1.v
+++ b/cells/fill/sky130_fd_sc_ms__fill_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__fill cell (
+    sky130_fd_sc_ms__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fill cell ();
+    sky130_fd_sc_ms__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_ms__fill_2.v b/cells/fill/sky130_fd_sc_ms__fill_2.v
index 964e696..c712205 100644
--- a/cells/fill/sky130_fd_sc_ms__fill_2.v
+++ b/cells/fill/sky130_fd_sc_ms__fill_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__fill cell (
+    sky130_fd_sc_ms__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fill cell ();
+    sky130_fd_sc_ms__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_ms__fill_4.v b/cells/fill/sky130_fd_sc_ms__fill_4.v
index e637e20..b910707 100644
--- a/cells/fill/sky130_fd_sc_ms__fill_4.v
+++ b/cells/fill/sky130_fd_sc_ms__fill_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__fill cell (
+    sky130_fd_sc_ms__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fill cell ();
+    sky130_fd_sc_ms__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_ms__fill_8.v b/cells/fill/sky130_fd_sc_ms__fill_8.v
index d76e341..3a31e41 100644
--- a/cells/fill/sky130_fd_sc_ms__fill_8.v
+++ b/cells/fill/sky130_fd_sc_ms__fill_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__fill cell (
+    sky130_fd_sc_ms__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fill cell ();
+    sky130_fd_sc_ms__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_2.v b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_2.v
index ee9f332..d67f288 100644
--- a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_2.v
+++ b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__fill_diode cell (
+    sky130_fd_sc_ms__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fill_diode cell ();
+    sky130_fd_sc_ms__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_4.v b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_4.v
index 0f20b3b..23139d6 100644
--- a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_4.v
+++ b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__fill_diode cell (
+    sky130_fd_sc_ms__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fill_diode cell ();
+    sky130_fd_sc_ms__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_8.v b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_8.v
index 86ed46d..85f63d1 100644
--- a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_8.v
+++ b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__fill_diode cell (
+    sky130_fd_sc_ms__fill_diode base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__fill_diode cell ();
+    sky130_fd_sc_ms__fill_diode base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/ha/sky130_fd_sc_ms__ha_1.v b/cells/ha/sky130_fd_sc_ms__ha_1.v
index de01a78..ecaa56e 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_1.v
+++ b/cells/ha/sky130_fd_sc_ms__ha_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__ha cell (
+    sky130_fd_sc_ms__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__ha cell (
+    sky130_fd_sc_ms__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_ms__ha_2.v b/cells/ha/sky130_fd_sc_ms__ha_2.v
index fa965b4..f87c7ee 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_2.v
+++ b/cells/ha/sky130_fd_sc_ms__ha_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__ha cell (
+    sky130_fd_sc_ms__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__ha cell (
+    sky130_fd_sc_ms__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/ha/sky130_fd_sc_ms__ha_4.v b/cells/ha/sky130_fd_sc_ms__ha_4.v
index b89587f..aac721b 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_4.v
+++ b/cells/ha/sky130_fd_sc_ms__ha_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__ha cell (
+    sky130_fd_sc_ms__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__ha cell (
+    sky130_fd_sc_ms__ha base (
         .COUT(COUT),
         .SUM(SUM),
         .A(A),
diff --git a/cells/inv/sky130_fd_sc_ms__inv_1.v b/cells/inv/sky130_fd_sc_ms__inv_1.v
index d429a61..12d66ba 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_1.v
+++ b/cells/inv/sky130_fd_sc_ms__inv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_ms__inv_16.v b/cells/inv/sky130_fd_sc_ms__inv_16.v
index 46774a9..ec28c02 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_16.v
+++ b/cells/inv/sky130_fd_sc_ms__inv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_ms__inv_2.v b/cells/inv/sky130_fd_sc_ms__inv_2.v
index 40517fb..2a8f245 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_2.v
+++ b/cells/inv/sky130_fd_sc_ms__inv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_ms__inv_4.v b/cells/inv/sky130_fd_sc_ms__inv_4.v
index 2e02a89..9362fec 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_4.v
+++ b/cells/inv/sky130_fd_sc_ms__inv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_ms__inv_8.v b/cells/inv/sky130_fd_sc_ms__inv_8.v
index 0da4bad..ab5629c 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_8.v
+++ b/cells/inv/sky130_fd_sc_ms__inv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__inv cell (
+    sky130_fd_sc_ms__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_1.v b/cells/maj3/sky130_fd_sc_ms__maj3_1.v
index 95c7a9c..dda0844 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_1.v
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__maj3 cell (
+    sky130_fd_sc_ms__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__maj3 cell (
+    sky130_fd_sc_ms__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_2.v b/cells/maj3/sky130_fd_sc_ms__maj3_2.v
index 74bae2e..9fb14d4 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_2.v
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__maj3 cell (
+    sky130_fd_sc_ms__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__maj3 cell (
+    sky130_fd_sc_ms__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_4.v b/cells/maj3/sky130_fd_sc_ms__maj3_4.v
index 28c9f79..4b603b5 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_4.v
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__maj3 cell (
+    sky130_fd_sc_ms__maj3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__maj3 cell (
+    sky130_fd_sc_ms__maj3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_1.v b/cells/mux2/sky130_fd_sc_ms__mux2_1.v
index 1921414..4f378d0 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_1.v
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux2 cell (
+    sky130_fd_sc_ms__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux2 cell (
+    sky130_fd_sc_ms__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_2.v b/cells/mux2/sky130_fd_sc_ms__mux2_2.v
index 41bbdbf..3ee249d 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_2.v
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux2 cell (
+    sky130_fd_sc_ms__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux2 cell (
+    sky130_fd_sc_ms__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_4.v b/cells/mux2/sky130_fd_sc_ms__mux2_4.v
index d794583..bcb05fa 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_4.v
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux2 cell (
+    sky130_fd_sc_ms__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux2 cell (
+    sky130_fd_sc_ms__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.v b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.v
index 20547b9..41e1def 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.v
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux2i cell (
+    sky130_fd_sc_ms__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux2i cell (
+    sky130_fd_sc_ms__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.v b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.v
index a0aebcf..77ce028 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.v
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux2i cell (
+    sky130_fd_sc_ms__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux2i cell (
+    sky130_fd_sc_ms__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.v b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.v
index af483d9..b6b94a1 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.v
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux2i cell (
+    sky130_fd_sc_ms__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux2i cell (
+    sky130_fd_sc_ms__mux2i base (
         .Y(Y),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_1.v b/cells/mux4/sky130_fd_sc_ms__mux4_1.v
index 1e8a403..499a91e 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_1.v
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux4 cell (
+    sky130_fd_sc_ms__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux4 cell (
+    sky130_fd_sc_ms__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_2.v b/cells/mux4/sky130_fd_sc_ms__mux4_2.v
index 09815bc..01e7d7a 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_2.v
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux4 cell (
+    sky130_fd_sc_ms__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux4 cell (
+    sky130_fd_sc_ms__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_4.v b/cells/mux4/sky130_fd_sc_ms__mux4_4.v
index 2001d4e..290ef27 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_4.v
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__mux4 cell (
+    sky130_fd_sc_ms__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__mux4 cell (
+    sky130_fd_sc_ms__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_1.v b/cells/nand2/sky130_fd_sc_ms__nand2_1.v
index 76254e4..679ea11 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_1.v
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand2 cell (
+    sky130_fd_sc_ms__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand2 cell (
+    sky130_fd_sc_ms__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_2.v b/cells/nand2/sky130_fd_sc_ms__nand2_2.v
index 6223336..d448566 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_2.v
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand2 cell (
+    sky130_fd_sc_ms__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand2 cell (
+    sky130_fd_sc_ms__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_4.v b/cells/nand2/sky130_fd_sc_ms__nand2_4.v
index 2ebdeb4..b7bc6dd 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_4.v
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand2 cell (
+    sky130_fd_sc_ms__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand2 cell (
+    sky130_fd_sc_ms__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_8.v b/cells/nand2/sky130_fd_sc_ms__nand2_8.v
index 186d406..25b4c8e 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_8.v
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand2 cell (
+    sky130_fd_sc_ms__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand2 cell (
+    sky130_fd_sc_ms__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.v b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.v
index 6318c0c..88fffce 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.v
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand2b cell (
+    sky130_fd_sc_ms__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand2b cell (
+    sky130_fd_sc_ms__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.v b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.v
index 8c41553..8a80aaa 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.v
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand2b cell (
+    sky130_fd_sc_ms__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand2b cell (
+    sky130_fd_sc_ms__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.v b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.v
index 97026a9..12d7f7e 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.v
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand2b cell (
+    sky130_fd_sc_ms__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand2b cell (
+    sky130_fd_sc_ms__nand2b base (
         .Y(Y),
         .A_N(A_N),
         .B(B)
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_1.v b/cells/nand3/sky130_fd_sc_ms__nand3_1.v
index 894cdae..5217b15 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_1.v
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand3 cell (
+    sky130_fd_sc_ms__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand3 cell (
+    sky130_fd_sc_ms__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_2.v b/cells/nand3/sky130_fd_sc_ms__nand3_2.v
index eb03773..4f4fdf9 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_2.v
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand3 cell (
+    sky130_fd_sc_ms__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand3 cell (
+    sky130_fd_sc_ms__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_4.v b/cells/nand3/sky130_fd_sc_ms__nand3_4.v
index bd95e81..d976676 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_4.v
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand3 cell (
+    sky130_fd_sc_ms__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand3 cell (
+    sky130_fd_sc_ms__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.v b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.v
index b1689fc..a2feb51 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.v
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand3b cell (
+    sky130_fd_sc_ms__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand3b cell (
+    sky130_fd_sc_ms__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.v b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.v
index d41c757..67653a7 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.v
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand3b cell (
+    sky130_fd_sc_ms__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand3b cell (
+    sky130_fd_sc_ms__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.v b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.v
index 2357cc9..1a642e8 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.v
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand3b cell (
+    sky130_fd_sc_ms__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand3b cell (
+    sky130_fd_sc_ms__nand3b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_1.v b/cells/nand4/sky130_fd_sc_ms__nand4_1.v
index db505c8..e7d5ef1 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_1.v
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4 cell (
+    sky130_fd_sc_ms__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4 cell (
+    sky130_fd_sc_ms__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_2.v b/cells/nand4/sky130_fd_sc_ms__nand4_2.v
index e055cc6..c43a421 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_2.v
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4 cell (
+    sky130_fd_sc_ms__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4 cell (
+    sky130_fd_sc_ms__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_4.v b/cells/nand4/sky130_fd_sc_ms__nand4_4.v
index 82a2cbc..4fba5c9 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_4.v
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4 cell (
+    sky130_fd_sc_ms__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4 cell (
+    sky130_fd_sc_ms__nand4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.v b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.v
index 211a518..6eeca80 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.v
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4b cell (
+    sky130_fd_sc_ms__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4b cell (
+    sky130_fd_sc_ms__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.v b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.v
index 165432b..fd1f56f 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.v
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4b cell (
+    sky130_fd_sc_ms__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4b cell (
+    sky130_fd_sc_ms__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.v b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.v
index bfc5264..d463235 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.v
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4b cell (
+    sky130_fd_sc_ms__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4b cell (
+    sky130_fd_sc_ms__nand4b base (
         .Y(Y),
         .A_N(A_N),
         .B(B),
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.v b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.v
index 72a7d60..0a7dbf7 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.v
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4bb cell (
+    sky130_fd_sc_ms__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4bb cell (
+    sky130_fd_sc_ms__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.v b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.v
index 6bf8f9a..bda3b74 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.v
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4bb cell (
+    sky130_fd_sc_ms__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4bb cell (
+    sky130_fd_sc_ms__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.v b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.v
index fa03594..d1eaccc 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.v
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nand4bb cell (
+    sky130_fd_sc_ms__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nand4bb cell (
+    sky130_fd_sc_ms__nand4bb base (
         .Y(Y),
         .A_N(A_N),
         .B_N(B_N),
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_1.v b/cells/nor2/sky130_fd_sc_ms__nor2_1.v
index a372acc..307c1db 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_1.v
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor2 cell (
+    sky130_fd_sc_ms__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor2 cell (
+    sky130_fd_sc_ms__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_2.v b/cells/nor2/sky130_fd_sc_ms__nor2_2.v
index c8d0f60..20761d3 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_2.v
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor2 cell (
+    sky130_fd_sc_ms__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor2 cell (
+    sky130_fd_sc_ms__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_4.v b/cells/nor2/sky130_fd_sc_ms__nor2_4.v
index 6d808da..b5595e9 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_4.v
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor2 cell (
+    sky130_fd_sc_ms__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor2 cell (
+    sky130_fd_sc_ms__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_8.v b/cells/nor2/sky130_fd_sc_ms__nor2_8.v
index 529b534..dbcf5ec 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_8.v
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_8.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor2 cell (
+    sky130_fd_sc_ms__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor2 cell (
+    sky130_fd_sc_ms__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.v b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.v
index 354147a..94b32ba 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.v
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor2b cell (
+    sky130_fd_sc_ms__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor2b cell (
+    sky130_fd_sc_ms__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.v b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.v
index c0d8bdc..60884b2 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.v
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor2b cell (
+    sky130_fd_sc_ms__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor2b cell (
+    sky130_fd_sc_ms__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.v b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.v
index f101d53..3f15d9a 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.v
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor2b cell (
+    sky130_fd_sc_ms__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor2b cell (
+    sky130_fd_sc_ms__nor2b base (
         .Y(Y),
         .A(A),
         .B_N(B_N)
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_1.v b/cells/nor3/sky130_fd_sc_ms__nor3_1.v
index 882841a..a5c3748 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_1.v
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor3 cell (
+    sky130_fd_sc_ms__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor3 cell (
+    sky130_fd_sc_ms__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_2.v b/cells/nor3/sky130_fd_sc_ms__nor3_2.v
index d0e38c1..15fa8bd 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_2.v
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor3 cell (
+    sky130_fd_sc_ms__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor3 cell (
+    sky130_fd_sc_ms__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_4.v b/cells/nor3/sky130_fd_sc_ms__nor3_4.v
index 7b5c07c..4cd8219 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_4.v
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor3 cell (
+    sky130_fd_sc_ms__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor3 cell (
+    sky130_fd_sc_ms__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.v b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.v
index cc3b2f1..c8f2b46 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.v
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor3b cell (
+    sky130_fd_sc_ms__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor3b cell (
+    sky130_fd_sc_ms__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.v b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.v
index 11523b5..3f921a3 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.v
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor3b cell (
+    sky130_fd_sc_ms__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor3b cell (
+    sky130_fd_sc_ms__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.v b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.v
index 1eb4b6c..bb5f74f 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.v
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor3b cell (
+    sky130_fd_sc_ms__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor3b cell (
+    sky130_fd_sc_ms__nor3b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_1.v b/cells/nor4/sky130_fd_sc_ms__nor4_1.v
index f8bf244..6d16f83 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_1.v
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4 cell (
+    sky130_fd_sc_ms__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4 cell (
+    sky130_fd_sc_ms__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_2.v b/cells/nor4/sky130_fd_sc_ms__nor4_2.v
index ec34560..c5e4437 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_2.v
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4 cell (
+    sky130_fd_sc_ms__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4 cell (
+    sky130_fd_sc_ms__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_4.v b/cells/nor4/sky130_fd_sc_ms__nor4_4.v
index 44906f0..39693ae 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_4.v
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4 cell (
+    sky130_fd_sc_ms__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4 cell (
+    sky130_fd_sc_ms__nor4 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.v b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.v
index 8d39055..2f78b58 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.v
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4b cell (
+    sky130_fd_sc_ms__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4b cell (
+    sky130_fd_sc_ms__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.v b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.v
index 56ac902..102aedb 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.v
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4b cell (
+    sky130_fd_sc_ms__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4b cell (
+    sky130_fd_sc_ms__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.v b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.v
index 8c56432..f4990be 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.v
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4b cell (
+    sky130_fd_sc_ms__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4b cell (
+    sky130_fd_sc_ms__nor4b base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.v b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.v
index 7b14c1b..b3325b5 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.v
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4bb cell (
+    sky130_fd_sc_ms__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4bb cell (
+    sky130_fd_sc_ms__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.v b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.v
index 9532e0a..08f9c3c 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.v
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4bb cell (
+    sky130_fd_sc_ms__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4bb cell (
+    sky130_fd_sc_ms__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.v b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.v
index f71411c..65a3148 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.v
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__nor4bb cell (
+    sky130_fd_sc_ms__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__nor4bb cell (
+    sky130_fd_sc_ms__nor4bb base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.v b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.v
index c76922e..1099e12 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.v
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2111a cell (
+    sky130_fd_sc_ms__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2111a cell (
+    sky130_fd_sc_ms__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.v b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.v
index 41a9f01..639762b 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.v
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2111a cell (
+    sky130_fd_sc_ms__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2111a cell (
+    sky130_fd_sc_ms__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.v b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.v
index a1ab947..5875991 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.v
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2111a cell (
+    sky130_fd_sc_ms__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2111a cell (
+    sky130_fd_sc_ms__o2111a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.v b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.v
index f0e0202..6fa56b4 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.v
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2111ai cell (
+    sky130_fd_sc_ms__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2111ai cell (
+    sky130_fd_sc_ms__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.v b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.v
index dcbceb3..42ca901 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.v
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2111ai cell (
+    sky130_fd_sc_ms__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2111ai cell (
+    sky130_fd_sc_ms__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.v b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.v
index 0362eac..d807374 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.v
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2111ai cell (
+    sky130_fd_sc_ms__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2111ai cell (
+    sky130_fd_sc_ms__o2111ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_1.v b/cells/o211a/sky130_fd_sc_ms__o211a_1.v
index 0ad14b2..8b88ae9 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_1.v
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o211a cell (
+    sky130_fd_sc_ms__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o211a cell (
+    sky130_fd_sc_ms__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_2.v b/cells/o211a/sky130_fd_sc_ms__o211a_2.v
index 3c11e87..19663de 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_2.v
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o211a cell (
+    sky130_fd_sc_ms__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o211a cell (
+    sky130_fd_sc_ms__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_4.v b/cells/o211a/sky130_fd_sc_ms__o211a_4.v
index e441ae9..7742ff1 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_4.v
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o211a cell (
+    sky130_fd_sc_ms__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o211a cell (
+    sky130_fd_sc_ms__o211a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.v b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.v
index 6c29873..9a4dbff 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.v
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o211ai cell (
+    sky130_fd_sc_ms__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o211ai cell (
+    sky130_fd_sc_ms__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.v b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.v
index aa2ff58..44cf0cc 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.v
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o211ai cell (
+    sky130_fd_sc_ms__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o211ai cell (
+    sky130_fd_sc_ms__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.v b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.v
index 885675c..b938870 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.v
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o211ai cell (
+    sky130_fd_sc_ms__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o211ai cell (
+    sky130_fd_sc_ms__o211ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_1.v b/cells/o21a/sky130_fd_sc_ms__o21a_1.v
index f7d1ab0..0d50fac 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_1.v
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21a cell (
+    sky130_fd_sc_ms__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21a cell (
+    sky130_fd_sc_ms__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_2.v b/cells/o21a/sky130_fd_sc_ms__o21a_2.v
index f58cf31..083c0d1 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_2.v
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21a cell (
+    sky130_fd_sc_ms__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21a cell (
+    sky130_fd_sc_ms__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_4.v b/cells/o21a/sky130_fd_sc_ms__o21a_4.v
index f91e121..24d725b 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_4.v
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21a cell (
+    sky130_fd_sc_ms__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21a cell (
+    sky130_fd_sc_ms__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.v b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.v
index 257fd2c..cf1b123 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.v
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21ai cell (
+    sky130_fd_sc_ms__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21ai cell (
+    sky130_fd_sc_ms__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.v b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.v
index 6dd1ac5..57539f5 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.v
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21ai cell (
+    sky130_fd_sc_ms__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21ai cell (
+    sky130_fd_sc_ms__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.v b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.v
index 6699497..3d0270c 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.v
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21ai cell (
+    sky130_fd_sc_ms__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21ai cell (
+    sky130_fd_sc_ms__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.v b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.v
index 6a8f459..ae94eaf 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.v
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21ba cell (
+    sky130_fd_sc_ms__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21ba cell (
+    sky130_fd_sc_ms__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.v b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.v
index e2029ce..b1cbaac 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.v
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21ba cell (
+    sky130_fd_sc_ms__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21ba cell (
+    sky130_fd_sc_ms__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.v b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.v
index 7d9364c..ebc8b58 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.v
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21ba cell (
+    sky130_fd_sc_ms__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21ba cell (
+    sky130_fd_sc_ms__o21ba base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.v b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.v
index f2282de..5f25ed3 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.v
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21bai cell (
+    sky130_fd_sc_ms__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21bai cell (
+    sky130_fd_sc_ms__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.v b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.v
index 388a353..b7a9418 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.v
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21bai cell (
+    sky130_fd_sc_ms__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21bai cell (
+    sky130_fd_sc_ms__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.v b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.v
index f52bcca..68c725e 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.v
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.v
@@ -58,7 +58,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o21bai cell (
+    sky130_fd_sc_ms__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -103,7 +103,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o21bai cell (
+    sky130_fd_sc_ms__o21bai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_1.v b/cells/o221a/sky130_fd_sc_ms__o221a_1.v
index be7e334..a8b0536 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_1.v
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o221a cell (
+    sky130_fd_sc_ms__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o221a cell (
+    sky130_fd_sc_ms__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_2.v b/cells/o221a/sky130_fd_sc_ms__o221a_2.v
index eb3bad7..b5e7c1b 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_2.v
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o221a cell (
+    sky130_fd_sc_ms__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o221a cell (
+    sky130_fd_sc_ms__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_4.v b/cells/o221a/sky130_fd_sc_ms__o221a_4.v
index 6c12fbe..cee0603 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_4.v
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o221a cell (
+    sky130_fd_sc_ms__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o221a cell (
+    sky130_fd_sc_ms__o221a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.v b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.v
index 87409bd..a0c79df 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.v
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o221ai cell (
+    sky130_fd_sc_ms__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o221ai cell (
+    sky130_fd_sc_ms__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.v b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.v
index bfb5c52..a4d836f 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.v
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o221ai cell (
+    sky130_fd_sc_ms__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o221ai cell (
+    sky130_fd_sc_ms__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.v b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.v
index ae81e7b..8e97969 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.v
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o221ai cell (
+    sky130_fd_sc_ms__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o221ai cell (
+    sky130_fd_sc_ms__o221ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_1.v b/cells/o22a/sky130_fd_sc_ms__o22a_1.v
index d831f5c..8bd7d77 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_1.v
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o22a cell (
+    sky130_fd_sc_ms__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o22a cell (
+    sky130_fd_sc_ms__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_2.v b/cells/o22a/sky130_fd_sc_ms__o22a_2.v
index dff0ede..19e9f9b 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_2.v
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o22a cell (
+    sky130_fd_sc_ms__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o22a cell (
+    sky130_fd_sc_ms__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_4.v b/cells/o22a/sky130_fd_sc_ms__o22a_4.v
index 4e34944..d82b9c6 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_4.v
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o22a cell (
+    sky130_fd_sc_ms__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o22a cell (
+    sky130_fd_sc_ms__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.v b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.v
index 5345864..cb4a24b 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.v
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o22ai cell (
+    sky130_fd_sc_ms__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o22ai cell (
+    sky130_fd_sc_ms__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.v b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.v
index e8d7b50..d40ca33 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.v
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o22ai cell (
+    sky130_fd_sc_ms__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o22ai cell (
+    sky130_fd_sc_ms__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.v b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.v
index 796f3aa..a1e7b07 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.v
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o22ai cell (
+    sky130_fd_sc_ms__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o22ai cell (
+    sky130_fd_sc_ms__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.v b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.v
index 6bb310e..4f7798d 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.v
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2bb2a cell (
+    sky130_fd_sc_ms__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2bb2a cell (
+    sky130_fd_sc_ms__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.v b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.v
index 3589110..352eaab 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.v
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2bb2a cell (
+    sky130_fd_sc_ms__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2bb2a cell (
+    sky130_fd_sc_ms__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.v b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.v
index 6f08723..1d1e084 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.v
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2bb2a cell (
+    sky130_fd_sc_ms__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2bb2a cell (
+    sky130_fd_sc_ms__o2bb2a base (
         .X(X),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.v b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.v
index fb99c8a..85f5663 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.v
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2bb2ai cell (
+    sky130_fd_sc_ms__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2bb2ai cell (
+    sky130_fd_sc_ms__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.v b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.v
index a6c28f2..6d499ba 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.v
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2bb2ai cell (
+    sky130_fd_sc_ms__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2bb2ai cell (
+    sky130_fd_sc_ms__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.v b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.v
index 34ec27b..45dc584 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.v
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o2bb2ai cell (
+    sky130_fd_sc_ms__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o2bb2ai cell (
+    sky130_fd_sc_ms__o2bb2ai base (
         .Y(Y),
         .A1_N(A1_N),
         .A2_N(A2_N),
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_1.v b/cells/o311a/sky130_fd_sc_ms__o311a_1.v
index b9103ce..032739f 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_1.v
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o311a cell (
+    sky130_fd_sc_ms__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o311a cell (
+    sky130_fd_sc_ms__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_2.v b/cells/o311a/sky130_fd_sc_ms__o311a_2.v
index 9a039cc..c790fb5 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_2.v
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o311a cell (
+    sky130_fd_sc_ms__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o311a cell (
+    sky130_fd_sc_ms__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_4.v b/cells/o311a/sky130_fd_sc_ms__o311a_4.v
index 92dd229..aee0a5d 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_4.v
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o311a cell (
+    sky130_fd_sc_ms__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o311a cell (
+    sky130_fd_sc_ms__o311a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.v b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.v
index 405498f..fcdc56c 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.v
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o311ai cell (
+    sky130_fd_sc_ms__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o311ai cell (
+    sky130_fd_sc_ms__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.v b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.v
index 51a5e85..c012f1e 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.v
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o311ai cell (
+    sky130_fd_sc_ms__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o311ai cell (
+    sky130_fd_sc_ms__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.v b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.v
index 66d48e1..514e12e 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.v
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o311ai cell (
+    sky130_fd_sc_ms__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o311ai cell (
+    sky130_fd_sc_ms__o311ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_1.v b/cells/o31a/sky130_fd_sc_ms__o31a_1.v
index 6d4ffc2..e8b0a07 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_1.v
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o31a cell (
+    sky130_fd_sc_ms__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o31a cell (
+    sky130_fd_sc_ms__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_2.v b/cells/o31a/sky130_fd_sc_ms__o31a_2.v
index e887bc8..69bf183 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_2.v
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o31a cell (
+    sky130_fd_sc_ms__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o31a cell (
+    sky130_fd_sc_ms__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_4.v b/cells/o31a/sky130_fd_sc_ms__o31a_4.v
index 3041e47..e65512e 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_4.v
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o31a cell (
+    sky130_fd_sc_ms__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o31a cell (
+    sky130_fd_sc_ms__o31a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.v b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.v
index fd40c24..024f87d 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.v
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o31ai cell (
+    sky130_fd_sc_ms__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o31ai cell (
+    sky130_fd_sc_ms__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.v b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.v
index d9f095d..9d24576 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.v
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o31ai cell (
+    sky130_fd_sc_ms__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o31ai cell (
+    sky130_fd_sc_ms__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.v b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.v
index 81ae8fb..e1bcf88 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.v
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o31ai cell (
+    sky130_fd_sc_ms__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o31ai cell (
+    sky130_fd_sc_ms__o31ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_1.v b/cells/o32a/sky130_fd_sc_ms__o32a_1.v
index 4110066..9f488b5 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_1.v
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o32a cell (
+    sky130_fd_sc_ms__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o32a cell (
+    sky130_fd_sc_ms__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_2.v b/cells/o32a/sky130_fd_sc_ms__o32a_2.v
index 7fbcc93..a4b6bd5 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_2.v
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o32a cell (
+    sky130_fd_sc_ms__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o32a cell (
+    sky130_fd_sc_ms__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_4.v b/cells/o32a/sky130_fd_sc_ms__o32a_4.v
index af783bb..361661d 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_4.v
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o32a cell (
+    sky130_fd_sc_ms__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o32a cell (
+    sky130_fd_sc_ms__o32a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.v b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.v
index bee23db..3790cc6 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.v
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o32ai cell (
+    sky130_fd_sc_ms__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o32ai cell (
+    sky130_fd_sc_ms__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.v b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.v
index f7a6bcb..f800ca7 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.v
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o32ai cell (
+    sky130_fd_sc_ms__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o32ai cell (
+    sky130_fd_sc_ms__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.v b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.v
index c25814c..849763f 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.v
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o32ai cell (
+    sky130_fd_sc_ms__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o32ai cell (
+    sky130_fd_sc_ms__o32ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_1.v b/cells/o41a/sky130_fd_sc_ms__o41a_1.v
index f4beeb8..909ff7d 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_1.v
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o41a cell (
+    sky130_fd_sc_ms__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o41a cell (
+    sky130_fd_sc_ms__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_2.v b/cells/o41a/sky130_fd_sc_ms__o41a_2.v
index 66ca7b3..4b18b1b 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_2.v
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o41a cell (
+    sky130_fd_sc_ms__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o41a cell (
+    sky130_fd_sc_ms__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_4.v b/cells/o41a/sky130_fd_sc_ms__o41a_4.v
index 0438f46..dc2802a 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_4.v
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o41a cell (
+    sky130_fd_sc_ms__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o41a cell (
+    sky130_fd_sc_ms__o41a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.v b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.v
index 39957f3..f94a836 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.v
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o41ai cell (
+    sky130_fd_sc_ms__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o41ai cell (
+    sky130_fd_sc_ms__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.v b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.v
index 491b791..5296503 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.v
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o41ai cell (
+    sky130_fd_sc_ms__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o41ai cell (
+    sky130_fd_sc_ms__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.v b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.v
index aff92ec..f607808 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.v
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__o41ai cell (
+    sky130_fd_sc_ms__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -112,7 +112,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__o41ai cell (
+    sky130_fd_sc_ms__o41ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/or2/sky130_fd_sc_ms__or2_1.v b/cells/or2/sky130_fd_sc_ms__or2_1.v
index ca55582..1e0956f 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_1.v
+++ b/cells/or2/sky130_fd_sc_ms__or2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or2 cell (
+    sky130_fd_sc_ms__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or2 cell (
+    sky130_fd_sc_ms__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_ms__or2_2.v b/cells/or2/sky130_fd_sc_ms__or2_2.v
index 87ad7e3..de47e42 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_2.v
+++ b/cells/or2/sky130_fd_sc_ms__or2_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or2 cell (
+    sky130_fd_sc_ms__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or2 cell (
+    sky130_fd_sc_ms__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2/sky130_fd_sc_ms__or2_4.v b/cells/or2/sky130_fd_sc_ms__or2_4.v
index 88446b0..78aadc8 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_4.v
+++ b/cells/or2/sky130_fd_sc_ms__or2_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or2 cell (
+    sky130_fd_sc_ms__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or2 cell (
+    sky130_fd_sc_ms__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_1.v b/cells/or2b/sky130_fd_sc_ms__or2b_1.v
index ff41307..d76649e 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_1.v
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or2b cell (
+    sky130_fd_sc_ms__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or2b cell (
+    sky130_fd_sc_ms__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_2.v b/cells/or2b/sky130_fd_sc_ms__or2b_2.v
index e06dc36..62499a9 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_2.v
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_2.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or2b cell (
+    sky130_fd_sc_ms__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or2b cell (
+    sky130_fd_sc_ms__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_4.v b/cells/or2b/sky130_fd_sc_ms__or2b_4.v
index 7a46f13..2780f60 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_4.v
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_4.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or2b cell (
+    sky130_fd_sc_ms__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or2b cell (
+    sky130_fd_sc_ms__or2b base (
         .X(X),
         .A(A),
         .B_N(B_N)
diff --git a/cells/or3/sky130_fd_sc_ms__or3_1.v b/cells/or3/sky130_fd_sc_ms__or3_1.v
index 9fdf0bf..f506950 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_1.v
+++ b/cells/or3/sky130_fd_sc_ms__or3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or3 cell (
+    sky130_fd_sc_ms__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or3 cell (
+    sky130_fd_sc_ms__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_ms__or3_2.v b/cells/or3/sky130_fd_sc_ms__or3_2.v
index 27c1c56..79896e2 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_2.v
+++ b/cells/or3/sky130_fd_sc_ms__or3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or3 cell (
+    sky130_fd_sc_ms__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or3 cell (
+    sky130_fd_sc_ms__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3/sky130_fd_sc_ms__or3_4.v b/cells/or3/sky130_fd_sc_ms__or3_4.v
index 143d998..58a4106 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_4.v
+++ b/cells/or3/sky130_fd_sc_ms__or3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or3 cell (
+    sky130_fd_sc_ms__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or3 cell (
+    sky130_fd_sc_ms__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_1.v b/cells/or3b/sky130_fd_sc_ms__or3b_1.v
index 970e2ea..8871e01 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_1.v
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or3b cell (
+    sky130_fd_sc_ms__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or3b cell (
+    sky130_fd_sc_ms__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_2.v b/cells/or3b/sky130_fd_sc_ms__or3b_2.v
index 1b8ad85..3ece2ac 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_2.v
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or3b cell (
+    sky130_fd_sc_ms__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or3b cell (
+    sky130_fd_sc_ms__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_4.v b/cells/or3b/sky130_fd_sc_ms__or3b_4.v
index f2da1a5..68d94eb 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_4.v
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or3b cell (
+    sky130_fd_sc_ms__or3b base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or3b cell (
+    sky130_fd_sc_ms__or3b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_ms__or4_1.v b/cells/or4/sky130_fd_sc_ms__or4_1.v
index 6cae6a2..a691659 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_1.v
+++ b/cells/or4/sky130_fd_sc_ms__or4_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4 cell (
+    sky130_fd_sc_ms__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4 cell (
+    sky130_fd_sc_ms__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_ms__or4_2.v b/cells/or4/sky130_fd_sc_ms__or4_2.v
index 30131a3..bdc4d7f 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_2.v
+++ b/cells/or4/sky130_fd_sc_ms__or4_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4 cell (
+    sky130_fd_sc_ms__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4 cell (
+    sky130_fd_sc_ms__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4/sky130_fd_sc_ms__or4_4.v b/cells/or4/sky130_fd_sc_ms__or4_4.v
index bb33f7a..0c257be 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_4.v
+++ b/cells/or4/sky130_fd_sc_ms__or4_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4 cell (
+    sky130_fd_sc_ms__or4 base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4 cell (
+    sky130_fd_sc_ms__or4 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_1.v b/cells/or4b/sky130_fd_sc_ms__or4b_1.v
index 4de8df5..ea27e58 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_1.v
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4b cell (
+    sky130_fd_sc_ms__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4b cell (
+    sky130_fd_sc_ms__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_2.v b/cells/or4b/sky130_fd_sc_ms__or4b_2.v
index 1a27dea..77707fa 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_2.v
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4b cell (
+    sky130_fd_sc_ms__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4b cell (
+    sky130_fd_sc_ms__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_4.v b/cells/or4b/sky130_fd_sc_ms__or4b_4.v
index 6373823..1963cc7 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_4.v
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4b cell (
+    sky130_fd_sc_ms__or4b base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4b cell (
+    sky130_fd_sc_ms__or4b base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.v b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.v
index bd3f13f..e5312ac 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.v
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4bb cell (
+    sky130_fd_sc_ms__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4bb cell (
+    sky130_fd_sc_ms__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.v b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.v
index ce377eb..cf6650c 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.v
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4bb cell (
+    sky130_fd_sc_ms__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4bb cell (
+    sky130_fd_sc_ms__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.v b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.v
index ac0354e..a893d65 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.v
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__or4bb cell (
+    sky130_fd_sc_ms__or4bb base (
         .X(X),
         .A(A),
         .B(B),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__or4bb cell (
+    sky130_fd_sc_ms__or4bb base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.v b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.v
index e7f84f6..a26a1c3 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.v
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfbbn cell (
+    sky130_fd_sc_ms__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfbbn cell (
+    sky130_fd_sc_ms__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.v b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.v
index 31dda94..6fac51e 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.v
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfbbn cell (
+    sky130_fd_sc_ms__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfbbn cell (
+    sky130_fd_sc_ms__sdfbbn base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.v b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.v
index a55e65c..d47e7e3 100644
--- a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.v
+++ b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.v
@@ -64,7 +64,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfbbp cell (
+    sky130_fd_sc_ms__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
@@ -121,7 +121,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfbbp cell (
+    sky130_fd_sc_ms__sdfbbp base (
         .Q(Q),
         .Q_N(Q_N),
         .D(D),
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.v b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.v
index 06d63d4..1ecbf28 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.v
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfrbp cell (
+    sky130_fd_sc_ms__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfrbp cell (
+    sky130_fd_sc_ms__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.v b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.v
index 07e23c8..4debc08 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.v
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfrbp cell (
+    sky130_fd_sc_ms__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfrbp cell (
+    sky130_fd_sc_ms__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.v b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.v
index 365aa92..81259ff 100644
--- a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.v
+++ b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfrtn cell (
+    sky130_fd_sc_ms__sdfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfrtn cell (
+    sky130_fd_sc_ms__sdfrtn base (
         .Q(Q),
         .CLK_N(CLK_N),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.v b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.v
index 33ffc32..e95bc50 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.v
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfrtp cell (
+    sky130_fd_sc_ms__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfrtp cell (
+    sky130_fd_sc_ms__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.v b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.v
index 76a8d58..371c42b 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.v
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfrtp cell (
+    sky130_fd_sc_ms__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfrtp cell (
+    sky130_fd_sc_ms__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.v b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.v
index 3b3da7d..179314b 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.v
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_ms__sdfrtp cell (
+    sky130_fd_sc_ms__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfrtp cell (
+    sky130_fd_sc_ms__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.v b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.v
index e4c38da..964ba36 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.v
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__sdfsbp cell (
+    sky130_fd_sc_ms__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfsbp cell (
+    sky130_fd_sc_ms__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.v b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.v
index 2587ab8..012b7e2 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.v
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__sdfsbp cell (
+    sky130_fd_sc_ms__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfsbp cell (
+    sky130_fd_sc_ms__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.v b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.v
index bae7697..db48661 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.v
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__sdfstp cell (
+    sky130_fd_sc_ms__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfstp cell (
+    sky130_fd_sc_ms__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.v b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.v
index 36fcd5d..b652475 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.v
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__sdfstp cell (
+    sky130_fd_sc_ms__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfstp cell (
+    sky130_fd_sc_ms__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.v b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.v
index 3c1632a..5fd2a53 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.v
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_ms__sdfstp cell (
+    sky130_fd_sc_ms__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfstp cell (
+    sky130_fd_sc_ms__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.v b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.v
index 4001ba0..73b9386 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.v
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sdfxbp cell (
+    sky130_fd_sc_ms__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfxbp cell (
+    sky130_fd_sc_ms__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.v b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.v
index f2378f3..50cd0c7 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.v
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sdfxbp cell (
+    sky130_fd_sc_ms__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfxbp cell (
+    sky130_fd_sc_ms__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.v b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.v
index 189596a..1bbf187 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.v
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sdfxtp cell (
+    sky130_fd_sc_ms__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfxtp cell (
+    sky130_fd_sc_ms__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.v b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.v
index 4780138..fdd3523 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.v
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sdfxtp cell (
+    sky130_fd_sc_ms__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfxtp cell (
+    sky130_fd_sc_ms__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.v b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.v
index 6603d75..d2dd7e4 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.v
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sdfxtp cell (
+    sky130_fd_sc_ms__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdfxtp cell (
+    sky130_fd_sc_ms__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.v b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.v
index 52960cd..b44ebb4 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.v
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sdlclkp cell (
+    sky130_fd_sc_ms__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdlclkp cell (
+    sky130_fd_sc_ms__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.v b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.v
index 980120e..ed1a69e 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.v
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sdlclkp cell (
+    sky130_fd_sc_ms__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdlclkp cell (
+    sky130_fd_sc_ms__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.v b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.v
index 877356d..e3339a5 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.v
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sdlclkp cell (
+    sky130_fd_sc_ms__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sdlclkp cell (
+    sky130_fd_sc_ms__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.v b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.v
index d7037ab..4646542 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.v
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sedfxbp cell (
+    sky130_fd_sc_ms__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sedfxbp cell (
+    sky130_fd_sc_ms__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.v b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.v
index 62d67d4..b4f8990 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.v
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.v
@@ -62,7 +62,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sedfxbp cell (
+    sky130_fd_sc_ms__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sedfxbp cell (
+    sky130_fd_sc_ms__sedfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.v b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.v
index 6f51569..9d97e63 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.v
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sedfxtp cell (
+    sky130_fd_sc_ms__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sedfxtp cell (
+    sky130_fd_sc_ms__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.v b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.v
index ec725ae..75f4d84 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.v
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sedfxtp cell (
+    sky130_fd_sc_ms__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sedfxtp cell (
+    sky130_fd_sc_ms__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.v b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.v
index a0191bc..5431198 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.v
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.v
@@ -60,7 +60,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__sedfxtp cell (
+    sky130_fd_sc_ms__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__sedfxtp cell (
+    sky130_fd_sc_ms__sedfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/tap/sky130_fd_sc_ms__tap_1.v b/cells/tap/sky130_fd_sc_ms__tap_1.v
index 839c559..21c226f 100644
--- a/cells/tap/sky130_fd_sc_ms__tap_1.v
+++ b/cells/tap/sky130_fd_sc_ms__tap_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__tap cell (
+    sky130_fd_sc_ms__tap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__tap cell ();
+    sky130_fd_sc_ms__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tap/sky130_fd_sc_ms__tap_2.v b/cells/tap/sky130_fd_sc_ms__tap_2.v
index 89baaea..4d1c81e 100644
--- a/cells/tap/sky130_fd_sc_ms__tap_2.v
+++ b/cells/tap/sky130_fd_sc_ms__tap_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__tap cell (
+    sky130_fd_sc_ms__tap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__tap cell ();
+    sky130_fd_sc_ms__tap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapmet1/sky130_fd_sc_ms__tapmet1_2.v b/cells/tapmet1/sky130_fd_sc_ms__tapmet1_2.v
index 07a7268..2f35ecf 100644
--- a/cells/tapmet1/sky130_fd_sc_ms__tapmet1_2.v
+++ b/cells/tapmet1/sky130_fd_sc_ms__tapmet1_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__tapmet1 cell (
+    sky130_fd_sc_ms__tapmet1 base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__tapmet1 cell ();
+    sky130_fd_sc_ms__tapmet1 base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd_1.v b/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd_1.v
index 57d05ea..16cecfb 100644
--- a/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd_1.v
+++ b/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd_1.v
@@ -48,7 +48,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__tapvgnd cell (
+    sky130_fd_sc_ms__tapvgnd base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -81,7 +81,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__tapvgnd cell ();
+    sky130_fd_sc_ms__tapvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2_1.v b/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2_1.v
index 9f29569..22a959a 100644
--- a/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2_1.v
+++ b/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2_1.v
@@ -48,7 +48,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__tapvgnd2 cell (
+    sky130_fd_sc_ms__tapvgnd2 base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -81,7 +81,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__tapvgnd2 cell ();
+    sky130_fd_sc_ms__tapvgnd2 base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd_1.v b/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd_1.v
index 6cb60c6..35c969a 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd_1.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_ms__tapvpwrvgnd cell (
+    sky130_fd_sc_ms__tapvpwrvgnd base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__tapvpwrvgnd cell ();
+    sky130_fd_sc_ms__tapvpwrvgnd base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.v b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.v
index 54357c4..acbe898 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.v
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xnor2 cell (
+    sky130_fd_sc_ms__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xnor2 cell (
+    sky130_fd_sc_ms__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.v b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.v
index 0034158..e5ef798 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.v
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xnor2 cell (
+    sky130_fd_sc_ms__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xnor2 cell (
+    sky130_fd_sc_ms__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.v b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.v
index c814620..bb80416 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.v
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xnor2 cell (
+    sky130_fd_sc_ms__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xnor2 cell (
+    sky130_fd_sc_ms__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.v b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.v
index 7da446e..9b44943 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.v
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xnor3 cell (
+    sky130_fd_sc_ms__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xnor3 cell (
+    sky130_fd_sc_ms__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.v b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.v
index 2b1c64a..e6ddb5a 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.v
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xnor3 cell (
+    sky130_fd_sc_ms__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xnor3 cell (
+    sky130_fd_sc_ms__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.v b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.v
index d8ba7a5..254d34f 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.v
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xnor3 cell (
+    sky130_fd_sc_ms__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xnor3 cell (
+    sky130_fd_sc_ms__xnor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_1.v b/cells/xor2/sky130_fd_sc_ms__xor2_1.v
index d2300e4..8f53d62 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_1.v
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xor2 cell (
+    sky130_fd_sc_ms__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xor2 cell (
+    sky130_fd_sc_ms__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_2.v b/cells/xor2/sky130_fd_sc_ms__xor2_2.v
index fd8fa57..13f06f5 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_2.v
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_2.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xor2 cell (
+    sky130_fd_sc_ms__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xor2 cell (
+    sky130_fd_sc_ms__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_4.v b/cells/xor2/sky130_fd_sc_ms__xor2_4.v
index 1a89518..cee1132 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_4.v
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_4.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xor2 cell (
+    sky130_fd_sc_ms__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xor2 cell (
+    sky130_fd_sc_ms__xor2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_1.v b/cells/xor3/sky130_fd_sc_ms__xor3_1.v
index 92c4a80..3672713 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_1.v
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xor3 cell (
+    sky130_fd_sc_ms__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xor3 cell (
+    sky130_fd_sc_ms__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_2.v b/cells/xor3/sky130_fd_sc_ms__xor3_2.v
index 675d438..81b2e19 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_2.v
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_2.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xor3 cell (
+    sky130_fd_sc_ms__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xor3 cell (
+    sky130_fd_sc_ms__xor3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_4.v b/cells/xor3/sky130_fd_sc_ms__xor3_4.v
index 0e9db33..3265cd3 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_4.v
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_4.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_ms__xor3 cell (
+    sky130_fd_sc_ms__xor3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_ms__xor3 cell (
+    sky130_fd_sc_ms__xor3 base (
         .X(X),
         .A(A),
         .B(B),