diff --git a/cells/a21o/sky130_fd_sc_hvl__a21o_1.v b/cells/a21o/sky130_fd_sc_hvl__a21o_1.v
index c3b1ef4..90da894 100644
--- a/cells/a21o/sky130_fd_sc_hvl__a21o_1.v
+++ b/cells/a21o/sky130_fd_sc_hvl__a21o_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__a21o cell (
+    sky130_fd_sc_hvl__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__a21o cell (
+    sky130_fd_sc_hvl__a21o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.v b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.v
index 0fccfe7..362f9ac 100644
--- a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.v
+++ b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__a21oi cell (
+    sky130_fd_sc_hvl__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__a21oi cell (
+    sky130_fd_sc_hvl__a21oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22o/sky130_fd_sc_hvl__a22o_1.v b/cells/a22o/sky130_fd_sc_hvl__a22o_1.v
index 90f5be9..5ed82b2 100644
--- a/cells/a22o/sky130_fd_sc_hvl__a22o_1.v
+++ b/cells/a22o/sky130_fd_sc_hvl__a22o_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__a22o cell (
+    sky130_fd_sc_hvl__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__a22o cell (
+    sky130_fd_sc_hvl__a22o base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.v b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.v
index 0438746..a083707 100644
--- a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.v
+++ b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__a22oi cell (
+    sky130_fd_sc_hvl__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__a22oi cell (
+    sky130_fd_sc_hvl__a22oi base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/and2/sky130_fd_sc_hvl__and2_1.v b/cells/and2/sky130_fd_sc_hvl__and2_1.v
index c8a146f..d9cf3a4 100644
--- a/cells/and2/sky130_fd_sc_hvl__and2_1.v
+++ b/cells/and2/sky130_fd_sc_hvl__and2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__and2 cell (
+    sky130_fd_sc_hvl__and2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__and2 cell (
+    sky130_fd_sc_hvl__and2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/and3/sky130_fd_sc_hvl__and3_1.v b/cells/and3/sky130_fd_sc_hvl__and3_1.v
index 8dbc42d..8ff4438 100644
--- a/cells/and3/sky130_fd_sc_hvl__and3_1.v
+++ b/cells/and3/sky130_fd_sc_hvl__and3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__and3 cell (
+    sky130_fd_sc_hvl__and3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__and3 cell (
+    sky130_fd_sc_hvl__and3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_1.v b/cells/buf/sky130_fd_sc_hvl__buf_1.v
index 8e8a733..e0586ca 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_1.v
+++ b/cells/buf/sky130_fd_sc_hvl__buf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_16.v b/cells/buf/sky130_fd_sc_hvl__buf_16.v
index 5e7feaa..c980ab5 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_16.v
+++ b/cells/buf/sky130_fd_sc_hvl__buf_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_2.v b/cells/buf/sky130_fd_sc_hvl__buf_2.v
index d01589a..118fec3 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_2.v
+++ b/cells/buf/sky130_fd_sc_hvl__buf_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_32.v b/cells/buf/sky130_fd_sc_hvl__buf_32.v
index bbdbaf1..584f8de 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_32.v
+++ b/cells/buf/sky130_fd_sc_hvl__buf_32.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_4.v b/cells/buf/sky130_fd_sc_hvl__buf_4.v
index c2496d1..c5d6dcf 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_4.v
+++ b/cells/buf/sky130_fd_sc_hvl__buf_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_8.v b/cells/buf/sky130_fd_sc_hvl__buf_8.v
index 118a88e..182c3f4 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_8.v
+++ b/cells/buf/sky130_fd_sc_hvl__buf_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__buf cell (
+    sky130_fd_sc_hvl__buf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/conb/sky130_fd_sc_hvl__conb_1.v b/cells/conb/sky130_fd_sc_hvl__conb_1.v
index c4a135c..6431c6c 100644
--- a/cells/conb/sky130_fd_sc_hvl__conb_1.v
+++ b/cells/conb/sky130_fd_sc_hvl__conb_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__conb cell (
+    sky130_fd_sc_hvl__conb base (
         .HI(HI),
         .LO(LO),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__conb cell (
+    sky130_fd_sc_hvl__conb base (
         .HI(HI),
         .LO(LO)
     );
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_4.v b/cells/decap/sky130_fd_sc_hvl__decap_4.v
index e9c54db..f5217f7 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_4.v
+++ b/cells/decap/sky130_fd_sc_hvl__decap_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hvl__decap cell (
+    sky130_fd_sc_hvl__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__decap cell ();
+    sky130_fd_sc_hvl__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_8.v b/cells/decap/sky130_fd_sc_hvl__decap_8.v
index 02dbb67..9ce70b3 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_8.v
+++ b/cells/decap/sky130_fd_sc_hvl__decap_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hvl__decap cell (
+    sky130_fd_sc_hvl__decap base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__decap cell ();
+    sky130_fd_sc_hvl__decap base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.v b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.v
index 4092827..b0ecdeb 100644
--- a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.v
+++ b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.v
@@ -57,7 +57,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hvl__dfrbp cell (
+    sky130_fd_sc_hvl__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dfrbp cell (
+    sky130_fd_sc_hvl__dfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.v b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.v
index c537b2b..2a66eee 100644
--- a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.v
+++ b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.v
@@ -55,7 +55,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hvl__dfrtp cell (
+    sky130_fd_sc_hvl__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dfrtp cell (
+    sky130_fd_sc_hvl__dfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.v b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.v
index 90e2396..5a65c0a 100644
--- a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.v
+++ b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.v
@@ -57,7 +57,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hvl__dfsbp cell (
+    sky130_fd_sc_hvl__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dfsbp cell (
+    sky130_fd_sc_hvl__dfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.v b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.v
index a2dc7b5..d42d078 100644
--- a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.v
+++ b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.v
@@ -55,7 +55,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hvl__dfstp cell (
+    sky130_fd_sc_hvl__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dfstp cell (
+    sky130_fd_sc_hvl__dfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.v b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.v
index 302851d..7bcd488 100644
--- a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.v
+++ b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__dfxbp cell (
+    sky130_fd_sc_hvl__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dfxbp cell (
+    sky130_fd_sc_hvl__dfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.v b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.v
index 562e935..3b22e97 100644
--- a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.v
+++ b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__dfxtp cell (
+    sky130_fd_sc_hvl__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dfxtp cell (
+    sky130_fd_sc_hvl__dfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D)
diff --git a/cells/diode/sky130_fd_sc_hvl__diode_2.v b/cells/diode/sky130_fd_sc_hvl__diode_2.v
index b13b20b..6d4ce0a 100644
--- a/cells/diode/sky130_fd_sc_hvl__diode_2.v
+++ b/cells/diode/sky130_fd_sc_hvl__diode_2.v
@@ -49,7 +49,7 @@
     input VGND ;
     input VPB  ;
     input VNB  ;
-    sky130_fd_sc_hvl__diode cell (
+    sky130_fd_sc_hvl__diode base (
         .DIODE(DIODE),
         .VPWR(VPWR),
         .VGND(VGND),
@@ -85,7 +85,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__diode cell (
+    sky130_fd_sc_hvl__diode base (
         .DIODE(DIODE)
     );
 
diff --git a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.v b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.v
index 78db2a6..f325e3f 100644
--- a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.v
+++ b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__dlclkp cell (
+    sky130_fd_sc_hvl__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dlclkp cell (
+    sky130_fd_sc_hvl__dlclkp base (
         .GCLK(GCLK),
         .GATE(GATE),
         .CLK(CLK)
diff --git a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.v b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.v
index 26ffbd3..75f9319 100644
--- a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.v
+++ b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.v
@@ -56,7 +56,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hvl__dlrtp cell (
+    sky130_fd_sc_hvl__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
@@ -101,7 +101,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dlrtp cell (
+    sky130_fd_sc_hvl__dlrtp base (
         .Q(Q),
         .RESET_B(RESET_B),
         .D(D),
diff --git a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.v b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.v
index 15ebcaf..e67034e 100644
--- a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.v
+++ b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__dlxtp cell (
+    sky130_fd_sc_hvl__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__dlxtp cell (
+    sky130_fd_sc_hvl__dlxtp base (
         .Q(Q),
         .D(D),
         .GATE(GATE)
diff --git a/cells/einvn/sky130_fd_sc_hvl__einvn_1.v b/cells/einvn/sky130_fd_sc_hvl__einvn_1.v
index e7f73f9..3c41d9f 100644
--- a/cells/einvn/sky130_fd_sc_hvl__einvn_1.v
+++ b/cells/einvn/sky130_fd_sc_hvl__einvn_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__einvn cell (
+    sky130_fd_sc_hvl__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__einvn cell (
+    sky130_fd_sc_hvl__einvn base (
         .Z(Z),
         .A(A),
         .TE_B(TE_B)
diff --git a/cells/einvp/sky130_fd_sc_hvl__einvp_1.v b/cells/einvp/sky130_fd_sc_hvl__einvp_1.v
index 78f8ab7..881fb3b 100644
--- a/cells/einvp/sky130_fd_sc_hvl__einvp_1.v
+++ b/cells/einvp/sky130_fd_sc_hvl__einvp_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__einvp cell (
+    sky130_fd_sc_hvl__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__einvp cell (
+    sky130_fd_sc_hvl__einvp base (
         .Z(Z),
         .A(A),
         .TE(TE)
diff --git a/cells/fill/sky130_fd_sc_hvl__fill_1.v b/cells/fill/sky130_fd_sc_hvl__fill_1.v
index 6f41a95..b86db9c 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill_1.v
+++ b/cells/fill/sky130_fd_sc_hvl__fill_1.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hvl__fill cell (
+    sky130_fd_sc_hvl__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__fill cell ();
+    sky130_fd_sc_hvl__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hvl__fill_2.v b/cells/fill/sky130_fd_sc_hvl__fill_2.v
index 215cc53..f36e6c4 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill_2.v
+++ b/cells/fill/sky130_fd_sc_hvl__fill_2.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hvl__fill cell (
+    sky130_fd_sc_hvl__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__fill cell ();
+    sky130_fd_sc_hvl__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hvl__fill_4.v b/cells/fill/sky130_fd_sc_hvl__fill_4.v
index 08c3e3c..645be9f 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill_4.v
+++ b/cells/fill/sky130_fd_sc_hvl__fill_4.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hvl__fill cell (
+    sky130_fd_sc_hvl__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__fill cell ();
+    sky130_fd_sc_hvl__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/fill/sky130_fd_sc_hvl__fill_8.v b/cells/fill/sky130_fd_sc_hvl__fill_8.v
index 7cf0620..8dd5702 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill_8.v
+++ b/cells/fill/sky130_fd_sc_hvl__fill_8.v
@@ -47,7 +47,7 @@
     input VGND;
     input VPB ;
     input VNB ;
-    sky130_fd_sc_hvl__fill cell (
+    sky130_fd_sc_hvl__fill base (
         .VPWR(VPWR),
         .VGND(VGND),
         .VPB(VPB),
@@ -80,7 +80,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__fill cell ();
+    sky130_fd_sc_hvl__fill base ();
 
 endmodule
 `endcelldefine
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_1.v b/cells/inv/sky130_fd_sc_hvl__inv_1.v
index de892e6..487d93d 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_1.v
+++ b/cells/inv/sky130_fd_sc_hvl__inv_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_16.v b/cells/inv/sky130_fd_sc_hvl__inv_16.v
index e35a266..5b41a54 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_16.v
+++ b/cells/inv/sky130_fd_sc_hvl__inv_16.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_2.v b/cells/inv/sky130_fd_sc_hvl__inv_2.v
index 9be72ca..7d2b41a 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_2.v
+++ b/cells/inv/sky130_fd_sc_hvl__inv_2.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_4.v b/cells/inv/sky130_fd_sc_hvl__inv_4.v
index e8aaa45..d2041b4 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_4.v
+++ b/cells/inv/sky130_fd_sc_hvl__inv_4.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_8.v b/cells/inv/sky130_fd_sc_hvl__inv_8.v
index 36cbdea..80865a5 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_8.v
+++ b/cells/inv/sky130_fd_sc_hvl__inv_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__inv cell (
+    sky130_fd_sc_hvl__inv base (
         .Y(Y),
         .A(A)
     );
diff --git a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.v b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.v
index f09c828..a03f5ad 100644
--- a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.v
+++ b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.v
@@ -54,7 +54,7 @@
     input  LOWHVPWR;
     input  VPB     ;
     input  VNB     ;
-    sky130_fd_sc_hvl__lsbufhv2hv_hl cell (
+    sky130_fd_sc_hvl__lsbufhv2hv_hl base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB     ;
     supply0 VNB     ;
 
-    sky130_fd_sc_hvl__lsbufhv2hv_hl cell (
+    sky130_fd_sc_hvl__lsbufhv2hv_hl base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.v b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.v
index c6087e6..e48cbc1 100644
--- a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.v
+++ b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.v
@@ -54,7 +54,7 @@
     input  LOWHVPWR;
     input  VPB     ;
     input  VNB     ;
-    sky130_fd_sc_hvl__lsbufhv2hv_lh cell (
+    sky130_fd_sc_hvl__lsbufhv2hv_lh base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB     ;
     supply0 VNB     ;
 
-    sky130_fd_sc_hvl__lsbufhv2hv_lh cell (
+    sky130_fd_sc_hvl__lsbufhv2hv_lh base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.v b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.v
index f2a3fc7..f30f591 100644
--- a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.v
+++ b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.v
@@ -53,7 +53,7 @@
     input  LVPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hvl__lsbufhv2lv cell (
+    sky130_fd_sc_hvl__lsbufhv2lv base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -96,7 +96,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hvl__lsbufhv2lv cell (
+    sky130_fd_sc_hvl__lsbufhv2lv base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.v b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.v
index b513a90..af5207a 100644
--- a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.v
+++ b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.v
@@ -55,7 +55,7 @@
     input  LVPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hvl__lsbufhv2lv_simple cell (
+    sky130_fd_sc_hvl__lsbufhv2lv_simple base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -98,7 +98,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hvl__lsbufhv2lv_simple cell (
+    sky130_fd_sc_hvl__lsbufhv2lv_simple base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.v b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.v
index a744c22..7bdbf37 100644
--- a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.v
+++ b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.v
@@ -54,7 +54,7 @@
     input  LVPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hvl__lsbuflv2hv cell (
+    sky130_fd_sc_hvl__lsbuflv2hv base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hvl__lsbuflv2hv cell (
+    sky130_fd_sc_hvl__lsbuflv2hv base (
         .X(X),
         .A(A)
     );
diff --git a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.v b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.v
index d538494..04a73e1 100644
--- a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.v
+++ b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.v
@@ -59,7 +59,7 @@
     input  LVPWR  ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg cell (
+    sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -105,7 +105,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg cell (
+    sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.v b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.v
index b0bbbf6..b74ff64 100644
--- a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.v
+++ b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.v
@@ -58,7 +58,7 @@
     input  LVPWR  ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon cell (
+    sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B),
@@ -104,7 +104,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon cell (
+    sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon base (
         .X(X),
         .A(A),
         .SLEEP_B(SLEEP_B)
diff --git a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.v b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.v
index 6077b15..4b7217a 100644
--- a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.v
+++ b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.v
@@ -54,7 +54,7 @@
     input  LVPWR;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hvl__lsbuflv2hv_symmetric cell (
+    sky130_fd_sc_hvl__lsbuflv2hv_symmetric base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -97,7 +97,7 @@
     supply1 VPB  ;
     supply0 VNB  ;
 
-    sky130_fd_sc_hvl__lsbuflv2hv_symmetric cell (
+    sky130_fd_sc_hvl__lsbuflv2hv_symmetric base (
         .X(X),
         .A(A)
     );
diff --git a/cells/mux2/sky130_fd_sc_hvl__mux2_1.v b/cells/mux2/sky130_fd_sc_hvl__mux2_1.v
index 280b6b5..d4adeca 100644
--- a/cells/mux2/sky130_fd_sc_hvl__mux2_1.v
+++ b/cells/mux2/sky130_fd_sc_hvl__mux2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__mux2 cell (
+    sky130_fd_sc_hvl__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__mux2 cell (
+    sky130_fd_sc_hvl__mux2 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/mux4/sky130_fd_sc_hvl__mux4_1.v b/cells/mux4/sky130_fd_sc_hvl__mux4_1.v
index 7b4bebb..b99ce75 100644
--- a/cells/mux4/sky130_fd_sc_hvl__mux4_1.v
+++ b/cells/mux4/sky130_fd_sc_hvl__mux4_1.v
@@ -61,7 +61,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__mux4 cell (
+    sky130_fd_sc_hvl__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
@@ -115,7 +115,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__mux4 cell (
+    sky130_fd_sc_hvl__mux4 base (
         .X(X),
         .A0(A0),
         .A1(A1),
diff --git a/cells/nand2/sky130_fd_sc_hvl__nand2_1.v b/cells/nand2/sky130_fd_sc_hvl__nand2_1.v
index 94d790e..eb6b45b 100644
--- a/cells/nand2/sky130_fd_sc_hvl__nand2_1.v
+++ b/cells/nand2/sky130_fd_sc_hvl__nand2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__nand2 cell (
+    sky130_fd_sc_hvl__nand2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__nand2 cell (
+    sky130_fd_sc_hvl__nand2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nand3/sky130_fd_sc_hvl__nand3_1.v b/cells/nand3/sky130_fd_sc_hvl__nand3_1.v
index 2680114..e777b9e 100644
--- a/cells/nand3/sky130_fd_sc_hvl__nand3_1.v
+++ b/cells/nand3/sky130_fd_sc_hvl__nand3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__nand3 cell (
+    sky130_fd_sc_hvl__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__nand3 cell (
+    sky130_fd_sc_hvl__nand3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/nor2/sky130_fd_sc_hvl__nor2_1.v b/cells/nor2/sky130_fd_sc_hvl__nor2_1.v
index b9f0a04..8988358 100644
--- a/cells/nor2/sky130_fd_sc_hvl__nor2_1.v
+++ b/cells/nor2/sky130_fd_sc_hvl__nor2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__nor2 cell (
+    sky130_fd_sc_hvl__nor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__nor2 cell (
+    sky130_fd_sc_hvl__nor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/nor3/sky130_fd_sc_hvl__nor3_1.v b/cells/nor3/sky130_fd_sc_hvl__nor3_1.v
index dceec1b..327bf4b 100644
--- a/cells/nor3/sky130_fd_sc_hvl__nor3_1.v
+++ b/cells/nor3/sky130_fd_sc_hvl__nor3_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__nor3 cell (
+    sky130_fd_sc_hvl__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__nor3 cell (
+    sky130_fd_sc_hvl__nor3 base (
         .Y(Y),
         .A(A),
         .B(B),
diff --git a/cells/o21a/sky130_fd_sc_hvl__o21a_1.v b/cells/o21a/sky130_fd_sc_hvl__o21a_1.v
index 12105e5..97bfc46 100644
--- a/cells/o21a/sky130_fd_sc_hvl__o21a_1.v
+++ b/cells/o21a/sky130_fd_sc_hvl__o21a_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__o21a cell (
+    sky130_fd_sc_hvl__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__o21a cell (
+    sky130_fd_sc_hvl__o21a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.v b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.v
index 3f0add5..b2e3c13 100644
--- a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.v
+++ b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__o21ai cell (
+    sky130_fd_sc_hvl__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -102,7 +102,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__o21ai cell (
+    sky130_fd_sc_hvl__o21ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22a/sky130_fd_sc_hvl__o22a_1.v b/cells/o22a/sky130_fd_sc_hvl__o22a_1.v
index 6906c10..3bfd961 100644
--- a/cells/o22a/sky130_fd_sc_hvl__o22a_1.v
+++ b/cells/o22a/sky130_fd_sc_hvl__o22a_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__o22a cell (
+    sky130_fd_sc_hvl__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__o22a cell (
+    sky130_fd_sc_hvl__o22a base (
         .X(X),
         .A1(A1),
         .A2(A2),
diff --git a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.v b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.v
index 47ac346..9df67cf 100644
--- a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.v
+++ b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__o22ai cell (
+    sky130_fd_sc_hvl__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
@@ -107,7 +107,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__o22ai cell (
+    sky130_fd_sc_hvl__o22ai base (
         .Y(Y),
         .A1(A1),
         .A2(A2),
diff --git a/cells/or2/sky130_fd_sc_hvl__or2_1.v b/cells/or2/sky130_fd_sc_hvl__or2_1.v
index f077365..4de50c2 100644
--- a/cells/or2/sky130_fd_sc_hvl__or2_1.v
+++ b/cells/or2/sky130_fd_sc_hvl__or2_1.v
@@ -53,7 +53,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__or2 cell (
+    sky130_fd_sc_hvl__or2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -95,7 +95,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__or2 cell (
+    sky130_fd_sc_hvl__or2 base (
         .X(X),
         .A(A),
         .B(B)
diff --git a/cells/or3/sky130_fd_sc_hvl__or3_1.v b/cells/or3/sky130_fd_sc_hvl__or3_1.v
index 7b11acc..90a041c 100644
--- a/cells/or3/sky130_fd_sc_hvl__or3_1.v
+++ b/cells/or3/sky130_fd_sc_hvl__or3_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__or3 cell (
+    sky130_fd_sc_hvl__or3 base (
         .X(X),
         .A(A),
         .B(B),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__or3 cell (
+    sky130_fd_sc_hvl__or3 base (
         .X(X),
         .A(A),
         .B(B),
diff --git a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.v b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.v
index 30262bd..080b1f2 100644
--- a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.v
+++ b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__probe_p cell (
+    sky130_fd_sc_hvl__probe_p base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__probe_p cell (
+    sky130_fd_sc_hvl__probe_p base (
         .X(X),
         .A(A)
     );
diff --git a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.v b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.v
index ef6a73e..0a91ab2 100644
--- a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.v
+++ b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__probec_p cell (
+    sky130_fd_sc_hvl__probec_p base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__probec_p cell (
+    sky130_fd_sc_hvl__probec_p base (
         .X(X),
         .A(A)
     );
diff --git a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.v b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.v
index f6f507e..ee4e60a 100644
--- a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.v
+++ b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.v
@@ -51,7 +51,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__schmittbuf cell (
+    sky130_fd_sc_hvl__schmittbuf base (
         .X(X),
         .A(A),
         .VPWR(VPWR),
@@ -90,7 +90,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__schmittbuf cell (
+    sky130_fd_sc_hvl__schmittbuf base (
         .X(X),
         .A(A)
     );
diff --git a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.v b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.v
index 9b6ec16..0b90d42 100644
--- a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.v
+++ b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.v
@@ -62,7 +62,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hvl__sdfrbp cell (
+    sky130_fd_sc_hvl__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__sdfrbp cell (
+    sky130_fd_sc_hvl__sdfrbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.v b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.v
index c4f8824..2c47ce7 100644
--- a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.v
+++ b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.v
@@ -60,7 +60,7 @@
     input  VGND   ;
     input  VPB    ;
     input  VNB    ;
-    sky130_fd_sc_hvl__sdfrtp cell (
+    sky130_fd_sc_hvl__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__sdfrtp cell (
+    sky130_fd_sc_hvl__sdfrtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.v b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.v
index a6ccfaf..69d5cff 100644
--- a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.v
+++ b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.v
@@ -62,7 +62,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hvl__sdfsbp cell (
+    sky130_fd_sc_hvl__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -116,7 +116,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__sdfsbp cell (
+    sky130_fd_sc_hvl__sdfsbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.v b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.v
index 7c8f866..77fb4c0 100644
--- a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.v
+++ b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.v
@@ -60,7 +60,7 @@
     input  VGND ;
     input  VPB  ;
     input  VNB  ;
-    sky130_fd_sc_hvl__sdfstp cell (
+    sky130_fd_sc_hvl__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -111,7 +111,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__sdfstp cell (
+    sky130_fd_sc_hvl__sdfstp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.v b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.v
index 8efaa25..73b486a 100644
--- a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.v
+++ b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.v
@@ -59,7 +59,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__sdfxbp cell (
+    sky130_fd_sc_hvl__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
@@ -110,7 +110,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__sdfxbp cell (
+    sky130_fd_sc_hvl__sdfxbp base (
         .Q(Q),
         .Q_N(Q_N),
         .CLK(CLK),
diff --git a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.v b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.v
index 6c0a1ef..53f08a8 100644
--- a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.v
+++ b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__sdfxtp cell (
+    sky130_fd_sc_hvl__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__sdfxtp cell (
+    sky130_fd_sc_hvl__sdfxtp base (
         .Q(Q),
         .CLK(CLK),
         .D(D),
diff --git a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.v b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.v
index 2b4dc00..fb68709 100644
--- a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.v
+++ b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__sdlclkp cell (
+    sky130_fd_sc_hvl__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
@@ -100,7 +100,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__sdlclkp cell (
+    sky130_fd_sc_hvl__sdlclkp base (
         .GCLK(GCLK),
         .SCE(SCE),
         .GATE(GATE),
diff --git a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.v b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.v
index 8b695d3..79ede03 100644
--- a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.v
+++ b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.v
@@ -57,7 +57,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__sdlxtp cell (
+    sky130_fd_sc_hvl__sdlxtp base (
         .Q(Q),
         .D(D),
         .SCD(SCD),
@@ -105,7 +105,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__sdlxtp cell (
+    sky130_fd_sc_hvl__sdlxtp base (
         .Q(Q),
         .D(D),
         .SCD(SCD),
diff --git a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.v b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.v
index e07f972..32828cf 100644
--- a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.v
+++ b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__xnor2 cell (
+    sky130_fd_sc_hvl__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__xnor2 cell (
+    sky130_fd_sc_hvl__xnor2 base (
         .Y(Y),
         .A(A),
         .B(B)
diff --git a/cells/xor2/sky130_fd_sc_hvl__xor2_1.v b/cells/xor2/sky130_fd_sc_hvl__xor2_1.v
index 2abcb00..bf2ef0e 100644
--- a/cells/xor2/sky130_fd_sc_hvl__xor2_1.v
+++ b/cells/xor2/sky130_fd_sc_hvl__xor2_1.v
@@ -55,7 +55,7 @@
     input  VGND;
     input  VPB ;
     input  VNB ;
-    sky130_fd_sc_hvl__xor2 cell (
+    sky130_fd_sc_hvl__xor2 base (
         .X(X),
         .A(A),
         .B(B),
@@ -97,7 +97,7 @@
     supply1 VPB ;
     supply0 VNB ;
 
-    sky130_fd_sc_hvl__xor2 cell (
+    sky130_fd_sc_hvl__xor2 base (
         .X(X),
         .A(A),
         .B(B)