diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o.v b/cells/a211o/sky130_fd_sc_hdll__a211o.v
index 599aef6..2ce17ff 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o.v
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a211o.pp.functional.v"
+`include "sky130_fd_sc_hdll__a211o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a211o.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a211o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi.v b/cells/a211oi/sky130_fd_sc_hdll__a211oi.v
index c03cf06..a5e10bb 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi.v
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a211oi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a211oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a211oi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a211oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo.v b/cells/a21bo/sky130_fd_sc_hdll__a21bo.v
index f54ed3d..d0d8905 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo.v
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a21bo.pp.functional.v"
+`include "sky130_fd_sc_hdll__a21bo.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a21bo.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a21bo.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi.v b/cells/a21boi/sky130_fd_sc_hdll__a21boi.v
index efe1ae0..2f65f75 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi.v
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a21boi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a21boi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a21boi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a21boi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o.v b/cells/a21o/sky130_fd_sc_hdll__a21o.v
index b96e688..697973e 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a21o.pp.functional.v"
+`include "sky130_fd_sc_hdll__a21o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a21o.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a21o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi.v b/cells/a21oi/sky130_fd_sc_hdll__a21oi.v
index 36a146c..382965a 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi.v
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a21oi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a21oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a21oi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a21oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi.v b/cells/a221oi/sky130_fd_sc_hdll__a221oi.v
index f51f1a9..ed3b679 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi.v
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a221oi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a221oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a221oi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a221oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi.v b/cells/a222oi/sky130_fd_sc_hdll__a222oi.v
index e15b703..b6ce3f0 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi.v
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a222oi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a222oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a222oi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a222oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o.v b/cells/a22o/sky130_fd_sc_hdll__a22o.v
index b8bc4dc..eb8e829 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o.v
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a22o.pp.functional.v"
+`include "sky130_fd_sc_hdll__a22o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a22o.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a22o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi.v b/cells/a22oi/sky130_fd_sc_hdll__a22oi.v
index ec5273e..b2bf7a1 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi.v
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a22oi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a22oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a22oi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a22oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o.v b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o.v
index c446bdb..982a773 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o.v
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a2bb2o.pp.functional.v"
+`include "sky130_fd_sc_hdll__a2bb2o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a2bb2o.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a2bb2o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi.v b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi.v
index 6fade0f..ea5365e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a2bb2oi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a2bb2oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a2bb2oi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a2bb2oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o.v b/cells/a31o/sky130_fd_sc_hdll__a31o.v
index 44edc0f..d61240c 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o.v
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a31o.pp.functional.v"
+`include "sky130_fd_sc_hdll__a31o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a31o.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a31o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi.v b/cells/a31oi/sky130_fd_sc_hdll__a31oi.v
index ad5e8ff..65350b2 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi.v
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a31oi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a31oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a31oi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a31oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o.v b/cells/a32o/sky130_fd_sc_hdll__a32o.v
index b30cd60..0d8f73d 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o.v
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a32o.pp.functional.v"
+`include "sky130_fd_sc_hdll__a32o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a32o.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a32o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi.v b/cells/a32oi/sky130_fd_sc_hdll__a32oi.v
index aefac45..7cb10ab 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi.v
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__a32oi.pp.functional.v"
+`include "sky130_fd_sc_hdll__a32oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__a32oi.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__a32oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2/sky130_fd_sc_hdll__and2.v b/cells/and2/sky130_fd_sc_hdll__and2.v
index f2c5557..74da70e 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__and2.pp.functional.v"
+`include "sky130_fd_sc_hdll__and2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__and2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__and2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b.v b/cells/and2b/sky130_fd_sc_hdll__and2b.v
index cac20a1..56a06a3 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b.v
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__and2b.pp.functional.v"
+`include "sky130_fd_sc_hdll__and2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__and2b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__and2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3/sky130_fd_sc_hdll__and3.v b/cells/and3/sky130_fd_sc_hdll__and3.v
index 8ef9e85..2b92f7a 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3.v
+++ b/cells/and3/sky130_fd_sc_hdll__and3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__and3.pp.functional.v"
+`include "sky130_fd_sc_hdll__and3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__and3.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__and3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b.v b/cells/and3b/sky130_fd_sc_hdll__and3b.v
index 86a08ea..8820891 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b.v
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__and3b.pp.functional.v"
+`include "sky130_fd_sc_hdll__and3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__and3b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__and3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4/sky130_fd_sc_hdll__and4.v b/cells/and4/sky130_fd_sc_hdll__and4.v
index 31cc267..0fee47a 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4.v
+++ b/cells/and4/sky130_fd_sc_hdll__and4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__and4.pp.functional.v"
+`include "sky130_fd_sc_hdll__and4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__and4.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__and4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b.v b/cells/and4b/sky130_fd_sc_hdll__and4b.v
index d11f289..8b13ac9 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b.v
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__and4b.pp.functional.v"
+`include "sky130_fd_sc_hdll__and4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__and4b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__and4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb.v b/cells/and4bb/sky130_fd_sc_hdll__and4bb.v
index d25bf7d..1420468 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb.v
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__and4bb.pp.functional.v"
+`include "sky130_fd_sc_hdll__and4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__and4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__and4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/buf/sky130_fd_sc_hdll__buf.v b/cells/buf/sky130_fd_sc_hdll__buf.v
index 76e65b3..fbfd957 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__buf.pp.functional.v"
+`include "sky130_fd_sc_hdll__buf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__buf.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__buf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf.v b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf.v
index 0256b14..fa474d1 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf.v
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__bufbuf.pp.functional.v"
+`include "sky130_fd_sc_hdll__bufbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__bufbuf.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__bufbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv.v b/cells/bufinv/sky130_fd_sc_hdll__bufinv.v
index 4080205..a0e68b2 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv.v
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__bufinv.pp.functional.v"
+`include "sky130_fd_sc_hdll__bufinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__bufinv.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__bufinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf.v
index 9205159..af5abb9 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__clkbuf.pp.functional.v"
+`include "sky130_fd_sc_hdll__clkbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__clkbuf.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__clkbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv.v
index 7affb57..b3a6519 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__clkinv.pp.functional.v"
+`include "sky130_fd_sc_hdll__clkinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__clkinv.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__clkinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp.v b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp.v
index 54c6c55..6514dfe 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp.v
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__clkinvlp.pp.functional.v"
+`include "sky130_fd_sc_hdll__clkinvlp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__clkinvlp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__clkinvlp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2.v b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2.v
index 982959b..566778b 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2.v
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__clkmux2.pp.functional.v"
+`include "sky130_fd_sc_hdll__clkmux2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__clkmux2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__clkmux2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/conb/sky130_fd_sc_hdll__conb.v b/cells/conb/sky130_fd_sc_hdll__conb.v
index 5bd2652..ccc65b0 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb.v
+++ b/cells/conb/sky130_fd_sc_hdll__conb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__conb.pp.functional.v"
+`include "sky130_fd_sc_hdll__conb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__conb.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__conb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decap/sky130_fd_sc_hdll__decap.v b/cells/decap/sky130_fd_sc_hdll__decap.v
index 5dca88e..b5009b0 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__decap.pp.functional.v"
+`include "sky130_fd_sc_hdll__decap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__decap.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__decap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp.v b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp.v
index b3eb7a4..859a9cb 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp.v
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__dfrtp.pp.functional.v"
+`include "sky130_fd_sc_hdll__dfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__dfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__dfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp.v b/cells/dfstp/sky130_fd_sc_hdll__dfstp.v
index ea3f1ed..8732e8e 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp.v
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__dfstp.pp.functional.v"
+`include "sky130_fd_sc_hdll__dfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__dfstp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__dfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/diode/sky130_fd_sc_hdll__diode.v b/cells/diode/sky130_fd_sc_hdll__diode.v
index 0640ec9..54babb8 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__diode.pp.functional.v"
+`include "sky130_fd_sc_hdll__diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__diode.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn.v b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn.v
index 109d548..7b12c53 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn.v
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlrtn.pp.functional.v"
+`include "sky130_fd_sc_hdll__dlrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlrtn.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__dlrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp.v b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp.v
index 0f7f125..09398b1 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp.v
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlrtp.pp.functional.v"
+`include "sky130_fd_sc_hdll__dlrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__dlrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn.v b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn.v
index 23fd133..82430c2 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn.v
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlxtn.pp.functional.v"
+`include "sky130_fd_sc_hdll__dlxtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlxtn.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__dlxtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1.v b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1.v
index 1a3f295..41f4f3e 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlygate4sd1.pp.functional.v"
+`include "sky130_fd_sc_hdll__dlygate4sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlygate4sd1.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__dlygate4sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2.v b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2.v
index 70f5cdc..239febc 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlygate4sd2.pp.functional.v"
+`include "sky130_fd_sc_hdll__dlygate4sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlygate4sd2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__dlygate4sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3.v b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3.v
index 9e61837..a8e4753 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlygate4sd3.pp.functional.v"
+`include "sky130_fd_sc_hdll__dlygate4sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__dlygate4sd3.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__dlygate4sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn.v
index 77d4fcc..2bac466 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__ebufn.pp.functional.v"
+`include "sky130_fd_sc_hdll__ebufn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__ebufn.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__ebufn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn.v b/cells/einvn/sky130_fd_sc_hdll__einvn.v
index 4570652..6d06cc1 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__einvn.pp.functional.v"
+`include "sky130_fd_sc_hdll__einvn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__einvn.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__einvn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp.v b/cells/einvp/sky130_fd_sc_hdll__einvp.v
index 80bac80..ece9b98 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__einvp.pp.functional.v"
+`include "sky130_fd_sc_hdll__einvp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__einvp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__einvp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill/sky130_fd_sc_hdll__fill.v b/cells/fill/sky130_fd_sc_hdll__fill.v
index 935b240..0ed635f 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__fill.pp.functional.v"
+`include "sky130_fd_sc_hdll__fill.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__fill.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__fill.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n.v b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n.v
index 4510d8f..1313b1a 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n.v
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__inputiso0n.pp.functional.v"
+`include "sky130_fd_sc_hdll__inputiso0n.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__inputiso0n.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__inputiso0n.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p.v b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p.v
index 0f116bd..c3b4290 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p.v
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__inputiso0p.pp.functional.v"
+`include "sky130_fd_sc_hdll__inputiso0p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__inputiso0p.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__inputiso0p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n.v b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n.v
index f03a9b1..f113308 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n.v
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__inputiso1n.pp.functional.v"
+`include "sky130_fd_sc_hdll__inputiso1n.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__inputiso1n.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__inputiso1n.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p.v b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p.v
index 946e4e6..ad0ad18 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p.v
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__inputiso1p.pp.functional.v"
+`include "sky130_fd_sc_hdll__inputiso1p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__inputiso1p.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__inputiso1p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inv/sky130_fd_sc_hdll__inv.v b/cells/inv/sky130_fd_sc_hdll__inv.v
index f4db5c2..81c1937 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__inv.pp.functional.v"
+`include "sky130_fd_sc_hdll__inv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__inv.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__inv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc.v
index 9c31200..39e0a10 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__isobufsrc.pp.functional.v"
+`include "sky130_fd_sc_hdll__isobufsrc.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__isobufsrc.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__isobufsrc.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2.v b/cells/mux2/sky130_fd_sc_hdll__mux2.v
index fa3badb..dfc89eb 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__mux2.pp.functional.v"
+`include "sky130_fd_sc_hdll__mux2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__mux2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__mux2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i.v b/cells/mux2i/sky130_fd_sc_hdll__mux2i.v
index f449a6c..77c2e6f 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i.v
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__mux2i.pp.functional.v"
+`include "sky130_fd_sc_hdll__mux2i.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__mux2i.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__mux2i.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1.v b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1.v
index 93c48c2..7ad3f2e 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1.v
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__muxb16to1.pp.functional.v"
+`include "sky130_fd_sc_hdll__muxb16to1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__muxb16to1.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__muxb16to1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1.v b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1.v
index 649bc33..ddece40 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1.v
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__muxb4to1.pp.functional.v"
+`include "sky130_fd_sc_hdll__muxb4to1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__muxb4to1.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__muxb4to1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1.v b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1.v
index 1b921c2..332670b 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1.v
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__muxb8to1.pp.functional.v"
+`include "sky130_fd_sc_hdll__muxb8to1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__muxb8to1.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__muxb8to1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2.v b/cells/nand2/sky130_fd_sc_hdll__nand2.v
index 058143f..8124f4a 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand2.pp.functional.v"
+`include "sky130_fd_sc_hdll__nand2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nand2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b.v b/cells/nand2b/sky130_fd_sc_hdll__nand2b.v
index d914afc..dfbf28f 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b.v
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand2b.pp.functional.v"
+`include "sky130_fd_sc_hdll__nand2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand2b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nand2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3.v b/cells/nand3/sky130_fd_sc_hdll__nand3.v
index 26c5b6d..1c99e4a 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3.v
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand3.pp.functional.v"
+`include "sky130_fd_sc_hdll__nand3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand3.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nand3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b.v b/cells/nand3b/sky130_fd_sc_hdll__nand3b.v
index a244d6b..fc71bef 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b.v
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand3b.pp.functional.v"
+`include "sky130_fd_sc_hdll__nand3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand3b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nand3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4.v b/cells/nand4/sky130_fd_sc_hdll__nand4.v
index 497cd2f..fbabc3a 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4.v
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand4.pp.functional.v"
+`include "sky130_fd_sc_hdll__nand4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand4.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nand4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b.v b/cells/nand4b/sky130_fd_sc_hdll__nand4b.v
index 9a562f1..7b94277 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b.v
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand4b.pp.functional.v"
+`include "sky130_fd_sc_hdll__nand4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand4b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nand4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb.v b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb.v
index 9d6c219..7d871e9 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb.v
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand4bb.pp.functional.v"
+`include "sky130_fd_sc_hdll__nand4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nand4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nand4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2.v b/cells/nor2/sky130_fd_sc_hdll__nor2.v
index eff6b52..57d0077 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor2.pp.functional.v"
+`include "sky130_fd_sc_hdll__nor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b.v b/cells/nor2b/sky130_fd_sc_hdll__nor2b.v
index 8ff98e1..7893d40 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b.v
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor2b.pp.functional.v"
+`include "sky130_fd_sc_hdll__nor2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor2b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nor2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3.v b/cells/nor3/sky130_fd_sc_hdll__nor3.v
index f329aa3..1527ed4 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3.v
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor3.pp.functional.v"
+`include "sky130_fd_sc_hdll__nor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor3.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b.v b/cells/nor3b/sky130_fd_sc_hdll__nor3b.v
index 86c34cb..b9d14b8 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b.v
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor3b.pp.functional.v"
+`include "sky130_fd_sc_hdll__nor3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor3b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nor3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4.v b/cells/nor4/sky130_fd_sc_hdll__nor4.v
index a343c7d..36208fc 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor4.pp.functional.v"
+`include "sky130_fd_sc_hdll__nor4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor4.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nor4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b.v b/cells/nor4b/sky130_fd_sc_hdll__nor4b.v
index 5a5ae47..884591f 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b.v
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor4b.pp.functional.v"
+`include "sky130_fd_sc_hdll__nor4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor4b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nor4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb.v b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb.v
index 91e43ca..f07a9c1 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb.v
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor4bb.pp.functional.v"
+`include "sky130_fd_sc_hdll__nor4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__nor4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__nor4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a.v b/cells/o211a/sky130_fd_sc_hdll__o211a.v
index ee2a5e0..058ace3 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a.v
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o211a.pp.functional.v"
+`include "sky130_fd_sc_hdll__o211a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o211a.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o211a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai.v b/cells/o211ai/sky130_fd_sc_hdll__o211ai.v
index 3e89c3c..9119183 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai.v
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o211ai.pp.functional.v"
+`include "sky130_fd_sc_hdll__o211ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o211ai.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o211ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a.v b/cells/o21a/sky130_fd_sc_hdll__o21a.v
index 0fbafee..1322318 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a.v
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o21a.pp.functional.v"
+`include "sky130_fd_sc_hdll__o21a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o21a.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o21a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai.v b/cells/o21ai/sky130_fd_sc_hdll__o21ai.v
index f368694..8e77014 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai.v
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o21ai.pp.functional.v"
+`include "sky130_fd_sc_hdll__o21ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o21ai.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o21ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba.v b/cells/o21ba/sky130_fd_sc_hdll__o21ba.v
index e119b92..58abb43 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba.v
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o21ba.pp.functional.v"
+`include "sky130_fd_sc_hdll__o21ba.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o21ba.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o21ba.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai.v b/cells/o21bai/sky130_fd_sc_hdll__o21bai.v
index c6fde72..501eb9f 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai.v
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o21bai.pp.functional.v"
+`include "sky130_fd_sc_hdll__o21bai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o21bai.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o21bai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a.v b/cells/o221a/sky130_fd_sc_hdll__o221a.v
index 27874f9..63067db 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a.v
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o221a.pp.functional.v"
+`include "sky130_fd_sc_hdll__o221a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o221a.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o221a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai.v b/cells/o221ai/sky130_fd_sc_hdll__o221ai.v
index c570009..33c71e3 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai.v
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o221ai.pp.functional.v"
+`include "sky130_fd_sc_hdll__o221ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o221ai.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o221ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a.v b/cells/o22a/sky130_fd_sc_hdll__o22a.v
index 11735ec..fab9ae1 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a.v
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o22a.pp.functional.v"
+`include "sky130_fd_sc_hdll__o22a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o22a.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o22a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai.v b/cells/o22ai/sky130_fd_sc_hdll__o22ai.v
index 26c6fec..ab80f8f 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai.v
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o22ai.pp.functional.v"
+`include "sky130_fd_sc_hdll__o22ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o22ai.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o22ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a.v b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a.v
index d312d48..7b61468 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a.v
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o2bb2a.pp.functional.v"
+`include "sky130_fd_sc_hdll__o2bb2a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o2bb2a.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o2bb2a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai.v b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai.v
index 598210a..a9d7b05 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o2bb2ai.pp.functional.v"
+`include "sky130_fd_sc_hdll__o2bb2ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o2bb2ai.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o2bb2ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai.v b/cells/o31ai/sky130_fd_sc_hdll__o31ai.v
index fcce196..906ecd7 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai.v
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o31ai.pp.functional.v"
+`include "sky130_fd_sc_hdll__o31ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o31ai.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o31ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai.v b/cells/o32ai/sky130_fd_sc_hdll__o32ai.v
index b1dac46..b81b5e9 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai.v
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__o32ai.pp.functional.v"
+`include "sky130_fd_sc_hdll__o32ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__o32ai.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__o32ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2/sky130_fd_sc_hdll__or2.v b/cells/or2/sky130_fd_sc_hdll__or2.v
index 28dab7b..22f8448 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__or2.pp.functional.v"
+`include "sky130_fd_sc_hdll__or2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__or2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__or2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b.v b/cells/or2b/sky130_fd_sc_hdll__or2b.v
index 1729c18..2d738af 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b.v
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__or2b.pp.functional.v"
+`include "sky130_fd_sc_hdll__or2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__or2b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__or2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3/sky130_fd_sc_hdll__or3.v b/cells/or3/sky130_fd_sc_hdll__or3.v
index 9b38292..cc2282a 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3.v
+++ b/cells/or3/sky130_fd_sc_hdll__or3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__or3.pp.functional.v"
+`include "sky130_fd_sc_hdll__or3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__or3.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__or3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b.v b/cells/or3b/sky130_fd_sc_hdll__or3b.v
index db5d7e8..53b35c3 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b.v
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__or3b.pp.functional.v"
+`include "sky130_fd_sc_hdll__or3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__or3b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__or3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4/sky130_fd_sc_hdll__or4.v b/cells/or4/sky130_fd_sc_hdll__or4.v
index 6ecc67c..f25f6c1 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4.v
+++ b/cells/or4/sky130_fd_sc_hdll__or4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__or4.pp.functional.v"
+`include "sky130_fd_sc_hdll__or4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__or4.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__or4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b.v b/cells/or4b/sky130_fd_sc_hdll__or4b.v
index 72ab93e..b48fd8f 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b.v
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__or4b.pp.functional.v"
+`include "sky130_fd_sc_hdll__or4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__or4b.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__or4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb.v b/cells/or4bb/sky130_fd_sc_hdll__or4bb.v
index 3bf89da..807bf0b 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb.v
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__or4bb.pp.functional.v"
+`include "sky130_fd_sc_hdll__or4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__or4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__or4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p.v b/cells/probe_p/sky130_fd_sc_hdll__probe_p.v
index 5ef14bf..1e52501 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p.v
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__probe_p.pp.functional.v"
+`include "sky130_fd_sc_hdll__probe_p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__probe_p.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__probe_p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p.v b/cells/probec_p/sky130_fd_sc_hdll__probec_p.v
index aeece8d..e0bb1fa 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p.v
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__probec_p.pp.functional.v"
+`include "sky130_fd_sc_hdll__probec_p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__probec_p.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__probec_p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp.v b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp.v
index 17e680c..3df9cd4 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp.v
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfbbp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp.v b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp.v
index 74fb0a9..8604ba0 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp.v
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfrbp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn.v b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn.v
index e4c8c26..36e6db0 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn.v
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfrtn.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp.v b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp.v
index d4dc691..dee8cbc 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp.v
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfrtp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp.v b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp.v
index ce093e5..07b65ea 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp.v
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfsbp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp.v b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp.v
index 426b6e5..f987813 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp.v
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfstp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfstp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp.v b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp.v
index 9ae2ae3..53a816a 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp.v
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfxbp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp.v b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp.v
index 4aac0b0..5599635 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp.v
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfxtp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp.v b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp.v
index 7eebe8e..46577a3 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp.v
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdlclkp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sdlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sdlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sdlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp.v b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp.v
index 29e713e..f04b984 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp.v
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__sedfxbp.pp.functional.v"
+`include "sky130_fd_sc_hdll__sedfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__sedfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__sedfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tap/sky130_fd_sc_hdll__tap.v b/cells/tap/sky130_fd_sc_hdll__tap.v
index 31ba56d..8cc8347 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap.v
+++ b/cells/tap/sky130_fd_sc_hdll__tap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__tap.pp.functional.v"
+`include "sky130_fd_sc_hdll__tap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__tap.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__tap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd.v b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd.v
index 4d7b513..6b3f1c7 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd.v
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__tapvgnd.pp.functional.v"
+`include "sky130_fd_sc_hdll__tapvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__tapvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__tapvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2.v b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2.v
index cb3a99d..9566062 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2.v
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__tapvgnd2.pp.functional.v"
+`include "sky130_fd_sc_hdll__tapvgnd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__tapvgnd2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__tapvgnd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd.v b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd.v
index 1e1edc7..b3966f2 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__tapvpwrvgnd.pp.functional.v"
+`include "sky130_fd_sc_hdll__tapvpwrvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__tapvpwrvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__tapvpwrvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2.v b/cells/xnor2/sky130_fd_sc_hdll__xnor2.v
index 8704d61..bafc70d 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2.v
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__xnor2.pp.functional.v"
+`include "sky130_fd_sc_hdll__xnor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__xnor2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__xnor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3.v b/cells/xnor3/sky130_fd_sc_hdll__xnor3.v
index eb00c28..2117969 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3.v
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__xnor3.pp.functional.v"
+`include "sky130_fd_sc_hdll__xnor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__xnor3.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__xnor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2.v b/cells/xor2/sky130_fd_sc_hdll__xor2.v
index e848d54..c3e9fc8 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2.v
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__xor2.pp.functional.v"
+`include "sky130_fd_sc_hdll__xor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__xor2.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__xor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3.v b/cells/xor3/sky130_fd_sc_hdll__xor3.v
index 81df0b0..1885c7b 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3.v
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hdll__xor3.pp.functional.v"
+`include "sky130_fd_sc_hdll__xor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hdll__xor3.pp.behavioral.v"
+`include "sky130_fd_sc_hdll__xor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS