diff --git a/cells/a21o/sky130_fd_sc_hvl__a21o.v b/cells/a21o/sky130_fd_sc_hvl__a21o.v
index 77ce603..1d6acef 100644
--- a/cells/a21o/sky130_fd_sc_hvl__a21o.v
+++ b/cells/a21o/sky130_fd_sc_hvl__a21o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__a21o.pp.functional.v"
+`include "sky130_fd_sc_hvl__a21o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__a21o.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__a21o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21oi/sky130_fd_sc_hvl__a21oi.v b/cells/a21oi/sky130_fd_sc_hvl__a21oi.v
index d2f5e80..ecab94e 100644
--- a/cells/a21oi/sky130_fd_sc_hvl__a21oi.v
+++ b/cells/a21oi/sky130_fd_sc_hvl__a21oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__a21oi.pp.functional.v"
+`include "sky130_fd_sc_hvl__a21oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__a21oi.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__a21oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22o/sky130_fd_sc_hvl__a22o.v b/cells/a22o/sky130_fd_sc_hvl__a22o.v
index fbf338e..2d274cf 100644
--- a/cells/a22o/sky130_fd_sc_hvl__a22o.v
+++ b/cells/a22o/sky130_fd_sc_hvl__a22o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__a22o.pp.functional.v"
+`include "sky130_fd_sc_hvl__a22o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__a22o.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__a22o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22oi/sky130_fd_sc_hvl__a22oi.v b/cells/a22oi/sky130_fd_sc_hvl__a22oi.v
index b658baf..63d0a0f 100644
--- a/cells/a22oi/sky130_fd_sc_hvl__a22oi.v
+++ b/cells/a22oi/sky130_fd_sc_hvl__a22oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__a22oi.pp.functional.v"
+`include "sky130_fd_sc_hvl__a22oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__a22oi.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__a22oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2/sky130_fd_sc_hvl__and2.v b/cells/and2/sky130_fd_sc_hvl__and2.v
index f167ace..ea502b3 100644
--- a/cells/and2/sky130_fd_sc_hvl__and2.v
+++ b/cells/and2/sky130_fd_sc_hvl__and2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__and2.pp.functional.v"
+`include "sky130_fd_sc_hvl__and2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__and2.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__and2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3/sky130_fd_sc_hvl__and3.v b/cells/and3/sky130_fd_sc_hvl__and3.v
index 4a451df..df25646 100644
--- a/cells/and3/sky130_fd_sc_hvl__and3.v
+++ b/cells/and3/sky130_fd_sc_hvl__and3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__and3.pp.functional.v"
+`include "sky130_fd_sc_hvl__and3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__and3.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__and3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/buf/sky130_fd_sc_hvl__buf.v b/cells/buf/sky130_fd_sc_hvl__buf.v
index 02fa439..719671b 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf.v
+++ b/cells/buf/sky130_fd_sc_hvl__buf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__buf.pp.functional.v"
+`include "sky130_fd_sc_hvl__buf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__buf.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__buf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/conb/sky130_fd_sc_hvl__conb.v b/cells/conb/sky130_fd_sc_hvl__conb.v
index 37206da..9589202 100644
--- a/cells/conb/sky130_fd_sc_hvl__conb.v
+++ b/cells/conb/sky130_fd_sc_hvl__conb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__conb.pp.functional.v"
+`include "sky130_fd_sc_hvl__conb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__conb.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__conb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decap/sky130_fd_sc_hvl__decap.v b/cells/decap/sky130_fd_sc_hvl__decap.v
index f98b1c2..b6a45ea 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap.v
+++ b/cells/decap/sky130_fd_sc_hvl__decap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__decap.pp.functional.v"
+`include "sky130_fd_sc_hvl__decap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__decap.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__decap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp.v b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp.v
index ec21978..5b74852 100644
--- a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp.v
+++ b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfrbp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp.v b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp.v
index 4fe4f86..49e389f 100644
--- a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp.v
+++ b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfrtp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp.v b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp.v
index 4fb248e..327528d 100644
--- a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp.v
+++ b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfsbp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfstp/sky130_fd_sc_hvl__dfstp.v b/cells/dfstp/sky130_fd_sc_hvl__dfstp.v
index 25c3929..690a9e6 100644
--- a/cells/dfstp/sky130_fd_sc_hvl__dfstp.v
+++ b/cells/dfstp/sky130_fd_sc_hvl__dfstp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfstp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfstp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp.v b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp.v
index 78470cd..80de413 100644
--- a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp.v
+++ b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfxbp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp.v b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp.v
index 4b668db..4151e7d 100644
--- a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp.v
+++ b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfxtp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/diode/sky130_fd_sc_hvl__diode.v b/cells/diode/sky130_fd_sc_hvl__diode.v
index 096e1ac..087b331 100644
--- a/cells/diode/sky130_fd_sc_hvl__diode.v
+++ b/cells/diode/sky130_fd_sc_hvl__diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__diode.pp.functional.v"
+`include "sky130_fd_sc_hvl__diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__diode.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp.v b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp.v
index c0ce9b3..9a6f61c 100644
--- a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp.v
+++ b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dlclkp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp.v b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp.v
index 6a3f12c..9aee2b1 100644
--- a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp.v
+++ b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dlrtp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dlrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dlrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dlrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp.v b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp.v
index 432fb07..b311586 100644
--- a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp.v
+++ b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__dlxtp.pp.functional.v"
+`include "sky130_fd_sc_hvl__dlxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__dlxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__dlxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvn/sky130_fd_sc_hvl__einvn.v b/cells/einvn/sky130_fd_sc_hvl__einvn.v
index 3fccccf..44b0187 100644
--- a/cells/einvn/sky130_fd_sc_hvl__einvn.v
+++ b/cells/einvn/sky130_fd_sc_hvl__einvn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__einvn.pp.functional.v"
+`include "sky130_fd_sc_hvl__einvn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__einvn.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__einvn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvp/sky130_fd_sc_hvl__einvp.v b/cells/einvp/sky130_fd_sc_hvl__einvp.v
index cd9140f..28797e0 100644
--- a/cells/einvp/sky130_fd_sc_hvl__einvp.v
+++ b/cells/einvp/sky130_fd_sc_hvl__einvp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__einvp.pp.functional.v"
+`include "sky130_fd_sc_hvl__einvp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__einvp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__einvp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill/sky130_fd_sc_hvl__fill.v b/cells/fill/sky130_fd_sc_hvl__fill.v
index aa9a2f7..4e76ed4 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill.v
+++ b/cells/fill/sky130_fd_sc_hvl__fill.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__fill.pp.functional.v"
+`include "sky130_fd_sc_hvl__fill.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__fill.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__fill.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inv/sky130_fd_sc_hvl__inv.v b/cells/inv/sky130_fd_sc_hvl__inv.v
index 9616b1c..fa88d91 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv.v
+++ b/cells/inv/sky130_fd_sc_hvl__inv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__inv.pp.functional.v"
+`include "sky130_fd_sc_hvl__inv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__inv.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__inv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl.v b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl.v
index 55f6441..c0697ed 100644
--- a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl.v
+++ b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbufhv2hv_hl.pp.functional.v"
+`include "sky130_fd_sc_hvl__lsbufhv2hv_hl.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbufhv2hv_hl.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__lsbufhv2hv_hl.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh.v b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh.v
index c5e451f..75e4011 100644
--- a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh.v
+++ b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbufhv2hv_lh.pp.functional.v"
+`include "sky130_fd_sc_hvl__lsbufhv2hv_lh.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbufhv2hv_lh.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__lsbufhv2hv_lh.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv.v b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv.v
index b324656..56d0e8d 100644
--- a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv.v
+++ b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbufhv2lv.pp.functional.v"
+`include "sky130_fd_sc_hvl__lsbufhv2lv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbufhv2lv.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__lsbufhv2lv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple.v b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple.v
index f7de2fe..2a552f5 100644
--- a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple.v
+++ b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbufhv2lv_simple.pp.functional.v"
+`include "sky130_fd_sc_hvl__lsbufhv2lv_simple.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbufhv2lv_simple.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__lsbufhv2lv_simple.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv.v b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv.v
index def4ba9..254278d 100644
--- a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv.v
+++ b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbuflv2hv.pp.functional.v"
+`include "sky130_fd_sc_hvl__lsbuflv2hv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbuflv2hv.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__lsbuflv2hv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg.v b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg.v
index 7517523..7b41910 100644
--- a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg.v
+++ b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg.pp.functional.v"
+`include "sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon.v b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon.v
index 7dfc6ef..db11eb7 100644
--- a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon.v
+++ b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon.pp.functional.v"
+`include "sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric.v b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric.v
index ebc15cc..fb6e8e8 100644
--- a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric.v
+++ b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbuflv2hv_symmetric.pp.functional.v"
+`include "sky130_fd_sc_hvl__lsbuflv2hv_symmetric.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__lsbuflv2hv_symmetric.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__lsbuflv2hv_symmetric.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2/sky130_fd_sc_hvl__mux2.v b/cells/mux2/sky130_fd_sc_hvl__mux2.v
index 48914db..1f2bbfc 100644
--- a/cells/mux2/sky130_fd_sc_hvl__mux2.v
+++ b/cells/mux2/sky130_fd_sc_hvl__mux2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__mux2.pp.functional.v"
+`include "sky130_fd_sc_hvl__mux2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__mux2.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__mux2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux4/sky130_fd_sc_hvl__mux4.v b/cells/mux4/sky130_fd_sc_hvl__mux4.v
index 9d93add..0493591 100644
--- a/cells/mux4/sky130_fd_sc_hvl__mux4.v
+++ b/cells/mux4/sky130_fd_sc_hvl__mux4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__mux4.pp.functional.v"
+`include "sky130_fd_sc_hvl__mux4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__mux4.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__mux4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2/sky130_fd_sc_hvl__nand2.v b/cells/nand2/sky130_fd_sc_hvl__nand2.v
index 86ec2b5..f0cdd09 100644
--- a/cells/nand2/sky130_fd_sc_hvl__nand2.v
+++ b/cells/nand2/sky130_fd_sc_hvl__nand2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__nand2.pp.functional.v"
+`include "sky130_fd_sc_hvl__nand2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__nand2.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__nand2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3/sky130_fd_sc_hvl__nand3.v b/cells/nand3/sky130_fd_sc_hvl__nand3.v
index ecf6c24..a994b8d 100644
--- a/cells/nand3/sky130_fd_sc_hvl__nand3.v
+++ b/cells/nand3/sky130_fd_sc_hvl__nand3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__nand3.pp.functional.v"
+`include "sky130_fd_sc_hvl__nand3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__nand3.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__nand3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2/sky130_fd_sc_hvl__nor2.v b/cells/nor2/sky130_fd_sc_hvl__nor2.v
index 5c37e8a..e771320 100644
--- a/cells/nor2/sky130_fd_sc_hvl__nor2.v
+++ b/cells/nor2/sky130_fd_sc_hvl__nor2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__nor2.pp.functional.v"
+`include "sky130_fd_sc_hvl__nor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__nor2.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__nor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3/sky130_fd_sc_hvl__nor3.v b/cells/nor3/sky130_fd_sc_hvl__nor3.v
index 9204348..07a6755 100644
--- a/cells/nor3/sky130_fd_sc_hvl__nor3.v
+++ b/cells/nor3/sky130_fd_sc_hvl__nor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__nor3.pp.functional.v"
+`include "sky130_fd_sc_hvl__nor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__nor3.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__nor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21a/sky130_fd_sc_hvl__o21a.v b/cells/o21a/sky130_fd_sc_hvl__o21a.v
index ef281a7..8a60380 100644
--- a/cells/o21a/sky130_fd_sc_hvl__o21a.v
+++ b/cells/o21a/sky130_fd_sc_hvl__o21a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__o21a.pp.functional.v"
+`include "sky130_fd_sc_hvl__o21a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__o21a.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__o21a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ai/sky130_fd_sc_hvl__o21ai.v b/cells/o21ai/sky130_fd_sc_hvl__o21ai.v
index 74d3bb0..49d9867 100644
--- a/cells/o21ai/sky130_fd_sc_hvl__o21ai.v
+++ b/cells/o21ai/sky130_fd_sc_hvl__o21ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__o21ai.pp.functional.v"
+`include "sky130_fd_sc_hvl__o21ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__o21ai.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__o21ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22a/sky130_fd_sc_hvl__o22a.v b/cells/o22a/sky130_fd_sc_hvl__o22a.v
index 6c19785..632cc78 100644
--- a/cells/o22a/sky130_fd_sc_hvl__o22a.v
+++ b/cells/o22a/sky130_fd_sc_hvl__o22a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__o22a.pp.functional.v"
+`include "sky130_fd_sc_hvl__o22a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__o22a.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__o22a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22ai/sky130_fd_sc_hvl__o22ai.v b/cells/o22ai/sky130_fd_sc_hvl__o22ai.v
index 55fd211..3aa24e7 100644
--- a/cells/o22ai/sky130_fd_sc_hvl__o22ai.v
+++ b/cells/o22ai/sky130_fd_sc_hvl__o22ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__o22ai.pp.functional.v"
+`include "sky130_fd_sc_hvl__o22ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__o22ai.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__o22ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2/sky130_fd_sc_hvl__or2.v b/cells/or2/sky130_fd_sc_hvl__or2.v
index 85b93e3..d46b6e9 100644
--- a/cells/or2/sky130_fd_sc_hvl__or2.v
+++ b/cells/or2/sky130_fd_sc_hvl__or2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__or2.pp.functional.v"
+`include "sky130_fd_sc_hvl__or2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__or2.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__or2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3/sky130_fd_sc_hvl__or3.v b/cells/or3/sky130_fd_sc_hvl__or3.v
index 9471c62..c2368fc 100644
--- a/cells/or3/sky130_fd_sc_hvl__or3.v
+++ b/cells/or3/sky130_fd_sc_hvl__or3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__or3.pp.functional.v"
+`include "sky130_fd_sc_hvl__or3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__or3.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__or3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/probe_p/sky130_fd_sc_hvl__probe_p.v b/cells/probe_p/sky130_fd_sc_hvl__probe_p.v
index b467e29..51bc7d8 100644
--- a/cells/probe_p/sky130_fd_sc_hvl__probe_p.v
+++ b/cells/probe_p/sky130_fd_sc_hvl__probe_p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__probe_p.pp.functional.v"
+`include "sky130_fd_sc_hvl__probe_p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__probe_p.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__probe_p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/probec_p/sky130_fd_sc_hvl__probec_p.v b/cells/probec_p/sky130_fd_sc_hvl__probec_p.v
index 0fd3cb3..bc8ff7b 100644
--- a/cells/probec_p/sky130_fd_sc_hvl__probec_p.v
+++ b/cells/probec_p/sky130_fd_sc_hvl__probec_p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__probec_p.pp.functional.v"
+`include "sky130_fd_sc_hvl__probec_p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__probec_p.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__probec_p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf.v b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf.v
index cdaafa9..35ea4f2 100644
--- a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf.v
+++ b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__schmittbuf.pp.functional.v"
+`include "sky130_fd_sc_hvl__schmittbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__schmittbuf.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__schmittbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp.v b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp.v
index b4ad958..7241bac 100644
--- a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp.v
+++ b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfrbp.pp.functional.v"
+`include "sky130_fd_sc_hvl__sdfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__sdfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp.v b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp.v
index 6cbfe8e..5278171 100644
--- a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp.v
+++ b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfrtp.pp.functional.v"
+`include "sky130_fd_sc_hvl__sdfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__sdfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp.v b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp.v
index 4a65a87..520ff42 100644
--- a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp.v
+++ b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfsbp.pp.functional.v"
+`include "sky130_fd_sc_hvl__sdfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__sdfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp.v b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp.v
index 43e1cd5..dd0302e 100644
--- a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp.v
+++ b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfstp.pp.functional.v"
+`include "sky130_fd_sc_hvl__sdfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfstp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__sdfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp.v b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp.v
index b0ca548..bf9a7fa 100644
--- a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp.v
+++ b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfxbp.pp.functional.v"
+`include "sky130_fd_sc_hvl__sdfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__sdfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp.v b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp.v
index 38bd3b8..472c3f2 100644
--- a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp.v
+++ b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfxtp.pp.functional.v"
+`include "sky130_fd_sc_hvl__sdfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__sdfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp.v b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp.v
index 04f5778..9d0f1ef 100644
--- a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp.v
+++ b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdlclkp.pp.functional.v"
+`include "sky130_fd_sc_hvl__sdlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__sdlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp.v b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp.v
index 127ac7d..5dcb67c 100644
--- a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp.v
+++ b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdlxtp.pp.functional.v"
+`include "sky130_fd_sc_hvl__sdlxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__sdlxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__sdlxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor2/sky130_fd_sc_hvl__xnor2.v b/cells/xnor2/sky130_fd_sc_hvl__xnor2.v
index 8d1aba0..030481b 100644
--- a/cells/xnor2/sky130_fd_sc_hvl__xnor2.v
+++ b/cells/xnor2/sky130_fd_sc_hvl__xnor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__xnor2.pp.functional.v"
+`include "sky130_fd_sc_hvl__xnor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__xnor2.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__xnor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor2/sky130_fd_sc_hvl__xor2.v b/cells/xor2/sky130_fd_sc_hvl__xor2.v
index 0da3ed3..58e4da6 100644
--- a/cells/xor2/sky130_fd_sc_hvl__xor2.v
+++ b/cells/xor2/sky130_fd_sc_hvl__xor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hvl__xor2.pp.functional.v"
+`include "sky130_fd_sc_hvl__xor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hvl__xor2.pp.behavioral.v"
+`include "sky130_fd_sc_hvl__xor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS