diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o.v b/cells/a2111o/sky130_fd_sc_hd__a2111o.v
index 5bca548..7a7f18e 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o.v
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a2111o.pp.functional.v"
+`include "sky130_fd_sc_hd__a2111o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a2111o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a2111o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi.v b/cells/a2111oi/sky130_fd_sc_hd__a2111oi.v
index 31d2e0f..1c0b0ed 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi.v
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a2111oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a2111oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a2111oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a2111oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o.v b/cells/a211o/sky130_fd_sc_hd__a211o.v
index e7cca34..9545b9e 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o.v
+++ b/cells/a211o/sky130_fd_sc_hd__a211o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a211o.pp.functional.v"
+`include "sky130_fd_sc_hd__a211o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a211o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a211o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi.v b/cells/a211oi/sky130_fd_sc_hd__a211oi.v
index ca146d0..c2569f6 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi.v
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a211oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a211oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a211oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a211oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo.v b/cells/a21bo/sky130_fd_sc_hd__a21bo.v
index 3646e84..cbf1e45 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo.v
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a21bo.pp.functional.v"
+`include "sky130_fd_sc_hd__a21bo.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a21bo.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a21bo.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi.v b/cells/a21boi/sky130_fd_sc_hd__a21boi.v
index 2746dd3..0639e81 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi.v
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a21boi.pp.functional.v"
+`include "sky130_fd_sc_hd__a21boi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a21boi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a21boi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o.v b/cells/a21o/sky130_fd_sc_hd__a21o.v
index f791fc3..8b2cafd 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o.v
+++ b/cells/a21o/sky130_fd_sc_hd__a21o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a21o.pp.functional.v"
+`include "sky130_fd_sc_hd__a21o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a21o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a21o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi.v b/cells/a21oi/sky130_fd_sc_hd__a21oi.v
index 309ff59..1a738a1 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi.v
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a21oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a21oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a21oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a21oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o.v b/cells/a221o/sky130_fd_sc_hd__a221o.v
index 069d302..8ac55eb 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o.v
+++ b/cells/a221o/sky130_fd_sc_hd__a221o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a221o.pp.functional.v"
+`include "sky130_fd_sc_hd__a221o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a221o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a221o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi.v b/cells/a221oi/sky130_fd_sc_hd__a221oi.v
index 828698a..8b7b759 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi.v
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a221oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a221oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a221oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a221oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a222oi/sky130_fd_sc_hd__a222oi.v b/cells/a222oi/sky130_fd_sc_hd__a222oi.v
index 4e361c3..dd01475 100644
--- a/cells/a222oi/sky130_fd_sc_hd__a222oi.v
+++ b/cells/a222oi/sky130_fd_sc_hd__a222oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a222oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a222oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a222oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a222oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o.v b/cells/a22o/sky130_fd_sc_hd__a22o.v
index 12b4f20..59ed4e4 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o.v
+++ b/cells/a22o/sky130_fd_sc_hd__a22o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a22o.pp.functional.v"
+`include "sky130_fd_sc_hd__a22o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a22o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a22o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi.v b/cells/a22oi/sky130_fd_sc_hd__a22oi.v
index 5b5dcda..0da9588 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi.v
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a22oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a22oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a22oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a22oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o.v b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o.v
index b220c15..61d7c8d 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o.v
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a2bb2o.pp.functional.v"
+`include "sky130_fd_sc_hd__a2bb2o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a2bb2o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a2bb2o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi.v b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi.v
index 96df7c3..5862def 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a2bb2oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a2bb2oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a2bb2oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a2bb2oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o.v b/cells/a311o/sky130_fd_sc_hd__a311o.v
index 2636cd1..7b7030d 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o.v
+++ b/cells/a311o/sky130_fd_sc_hd__a311o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a311o.pp.functional.v"
+`include "sky130_fd_sc_hd__a311o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a311o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a311o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi.v b/cells/a311oi/sky130_fd_sc_hd__a311oi.v
index 82cd5d4..e99c8a6 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi.v
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a311oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a311oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a311oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a311oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o.v b/cells/a31o/sky130_fd_sc_hd__a31o.v
index 5251e48..1b7d9f4 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o.v
+++ b/cells/a31o/sky130_fd_sc_hd__a31o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a31o.pp.functional.v"
+`include "sky130_fd_sc_hd__a31o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a31o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a31o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi.v b/cells/a31oi/sky130_fd_sc_hd__a31oi.v
index 8585b43..934933a 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi.v
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a31oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a31oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a31oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a31oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o.v b/cells/a32o/sky130_fd_sc_hd__a32o.v
index 6d76c82..21423d9 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o.v
+++ b/cells/a32o/sky130_fd_sc_hd__a32o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a32o.pp.functional.v"
+`include "sky130_fd_sc_hd__a32o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a32o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a32o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi.v b/cells/a32oi/sky130_fd_sc_hd__a32oi.v
index 85da791..8ac6ad3 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi.v
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a32oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a32oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a32oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a32oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o.v b/cells/a41o/sky130_fd_sc_hd__a41o.v
index 109b58a..54381c8 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o.v
+++ b/cells/a41o/sky130_fd_sc_hd__a41o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a41o.pp.functional.v"
+`include "sky130_fd_sc_hd__a41o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a41o.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a41o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi.v b/cells/a41oi/sky130_fd_sc_hd__a41oi.v
index d527615..06e5011 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi.v
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__a41oi.pp.functional.v"
+`include "sky130_fd_sc_hd__a41oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__a41oi.pp.behavioral.v"
+`include "sky130_fd_sc_hd__a41oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2/sky130_fd_sc_hd__and2.v b/cells/and2/sky130_fd_sc_hd__and2.v
index fd438d9..7fa2e46 100644
--- a/cells/and2/sky130_fd_sc_hd__and2.v
+++ b/cells/and2/sky130_fd_sc_hd__and2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__and2.pp.functional.v"
+`include "sky130_fd_sc_hd__and2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__and2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__and2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b.v b/cells/and2b/sky130_fd_sc_hd__and2b.v
index 49a8f0d..7b826ac 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b.v
+++ b/cells/and2b/sky130_fd_sc_hd__and2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__and2b.pp.functional.v"
+`include "sky130_fd_sc_hd__and2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__and2b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__and2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3/sky130_fd_sc_hd__and3.v b/cells/and3/sky130_fd_sc_hd__and3.v
index bffc72a..cd30ff8 100644
--- a/cells/and3/sky130_fd_sc_hd__and3.v
+++ b/cells/and3/sky130_fd_sc_hd__and3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__and3.pp.functional.v"
+`include "sky130_fd_sc_hd__and3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__and3.pp.behavioral.v"
+`include "sky130_fd_sc_hd__and3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b.v b/cells/and3b/sky130_fd_sc_hd__and3b.v
index b04a6bd..af08cef 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b.v
+++ b/cells/and3b/sky130_fd_sc_hd__and3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__and3b.pp.functional.v"
+`include "sky130_fd_sc_hd__and3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__and3b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__and3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4/sky130_fd_sc_hd__and4.v b/cells/and4/sky130_fd_sc_hd__and4.v
index 83a382b..4d45bef 100644
--- a/cells/and4/sky130_fd_sc_hd__and4.v
+++ b/cells/and4/sky130_fd_sc_hd__and4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__and4.pp.functional.v"
+`include "sky130_fd_sc_hd__and4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__and4.pp.behavioral.v"
+`include "sky130_fd_sc_hd__and4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b.v b/cells/and4b/sky130_fd_sc_hd__and4b.v
index b278fb8..e57be66 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b.v
+++ b/cells/and4b/sky130_fd_sc_hd__and4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__and4b.pp.functional.v"
+`include "sky130_fd_sc_hd__and4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__and4b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__and4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb.v b/cells/and4bb/sky130_fd_sc_hd__and4bb.v
index eac94e6..ce5f791 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb.v
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__and4bb.pp.functional.v"
+`include "sky130_fd_sc_hd__and4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__and4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hd__and4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/buf/sky130_fd_sc_hd__buf.v b/cells/buf/sky130_fd_sc_hd__buf.v
index 1daeede..da4f58a 100644
--- a/cells/buf/sky130_fd_sc_hd__buf.v
+++ b/cells/buf/sky130_fd_sc_hd__buf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__buf.pp.functional.v"
+`include "sky130_fd_sc_hd__buf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__buf.pp.behavioral.v"
+`include "sky130_fd_sc_hd__buf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf.v b/cells/bufbuf/sky130_fd_sc_hd__bufbuf.v
index e14c5e4..934bac9 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf.v
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__bufbuf.pp.functional.v"
+`include "sky130_fd_sc_hd__bufbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__bufbuf.pp.behavioral.v"
+`include "sky130_fd_sc_hd__bufbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv.v b/cells/bufinv/sky130_fd_sc_hd__bufinv.v
index 47af636..d78cb24 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv.v
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__bufinv.pp.functional.v"
+`include "sky130_fd_sc_hd__bufinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__bufinv.pp.behavioral.v"
+`include "sky130_fd_sc_hd__bufinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf.v b/cells/clkbuf/sky130_fd_sc_hd__clkbuf.v
index c3cadf6..72851c5 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf.v
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__clkbuf.pp.functional.v"
+`include "sky130_fd_sc_hd__clkbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__clkbuf.pp.behavioral.v"
+`include "sky130_fd_sc_hd__clkbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15.v b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15.v
index 05893d3..e899cb4 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15.v
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__clkdlybuf4s15.pp.functional.v"
+`include "sky130_fd_sc_hd__clkdlybuf4s15.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__clkdlybuf4s15.pp.behavioral.v"
+`include "sky130_fd_sc_hd__clkdlybuf4s15.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18.v b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18.v
index 8077e66..c1db5be 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18.v
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__clkdlybuf4s18.pp.functional.v"
+`include "sky130_fd_sc_hd__clkdlybuf4s18.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__clkdlybuf4s18.pp.behavioral.v"
+`include "sky130_fd_sc_hd__clkdlybuf4s18.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25.v b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25.v
index cbfaa4b..f197424 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25.v
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__clkdlybuf4s25.pp.functional.v"
+`include "sky130_fd_sc_hd__clkdlybuf4s25.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__clkdlybuf4s25.pp.behavioral.v"
+`include "sky130_fd_sc_hd__clkdlybuf4s25.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50.v b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50.v
index 2dc389f..8c598b9 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50.v
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__clkdlybuf4s50.pp.functional.v"
+`include "sky130_fd_sc_hd__clkdlybuf4s50.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__clkdlybuf4s50.pp.behavioral.v"
+`include "sky130_fd_sc_hd__clkdlybuf4s50.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv.v b/cells/clkinv/sky130_fd_sc_hd__clkinv.v
index d64752d..cb9a3fe 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv.v
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__clkinv.pp.functional.v"
+`include "sky130_fd_sc_hd__clkinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__clkinv.pp.behavioral.v"
+`include "sky130_fd_sc_hd__clkinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp.v b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp.v
index 175ea0b..1b2b2df 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp.v
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__clkinvlp.pp.functional.v"
+`include "sky130_fd_sc_hd__clkinvlp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__clkinvlp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__clkinvlp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/conb/sky130_fd_sc_hd__conb.v b/cells/conb/sky130_fd_sc_hd__conb.v
index 3a7a77d..fb973c4 100644
--- a/cells/conb/sky130_fd_sc_hd__conb.v
+++ b/cells/conb/sky130_fd_sc_hd__conb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__conb.pp.functional.v"
+`include "sky130_fd_sc_hd__conb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__conb.pp.behavioral.v"
+`include "sky130_fd_sc_hd__conb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decap/sky130_fd_sc_hd__decap.v b/cells/decap/sky130_fd_sc_hd__decap.v
index fe979bc..2efdef0 100644
--- a/cells/decap/sky130_fd_sc_hd__decap.v
+++ b/cells/decap/sky130_fd_sc_hd__decap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__decap.pp.functional.v"
+`include "sky130_fd_sc_hd__decap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__decap.pp.behavioral.v"
+`include "sky130_fd_sc_hd__decap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn.v b/cells/dfbbn/sky130_fd_sc_hd__dfbbn.v
index da2c6fc..bd1452f 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn.v
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfbbn.pp.functional.v"
+`include "sky130_fd_sc_hd__dfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbp/sky130_fd_sc_hd__dfbbp.v b/cells/dfbbp/sky130_fd_sc_hd__dfbbp.v
index 62f7c58..8e95a80 100644
--- a/cells/dfbbp/sky130_fd_sc_hd__dfbbp.v
+++ b/cells/dfbbp/sky130_fd_sc_hd__dfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfbbp.pp.functional.v"
+`include "sky130_fd_sc_hd__dfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp.v b/cells/dfrbp/sky130_fd_sc_hd__dfrbp.v
index 3ab7ffb..c40c59a 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp.v
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfrbp.pp.functional.v"
+`include "sky130_fd_sc_hd__dfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtn/sky130_fd_sc_hd__dfrtn.v b/cells/dfrtn/sky130_fd_sc_hd__dfrtn.v
index 18ea4fa..aaeece1 100644
--- a/cells/dfrtn/sky130_fd_sc_hd__dfrtn.v
+++ b/cells/dfrtn/sky130_fd_sc_hd__dfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfrtn.pp.functional.v"
+`include "sky130_fd_sc_hd__dfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp.v b/cells/dfrtp/sky130_fd_sc_hd__dfrtp.v
index 731d961..ef602c1 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp.v
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfrtp.pp.functional.v"
+`include "sky130_fd_sc_hd__dfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp.v b/cells/dfsbp/sky130_fd_sc_hd__dfsbp.v
index 02a22fa..5c61a7f 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp.v
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfsbp.pp.functional.v"
+`include "sky130_fd_sc_hd__dfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp.v b/cells/dfstp/sky130_fd_sc_hd__dfstp.v
index ae05332..c62872b 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp.v
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfstp.pp.functional.v"
+`include "sky130_fd_sc_hd__dfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfstp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp.v b/cells/dfxbp/sky130_fd_sc_hd__dfxbp.v
index 2feef12..e783081 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp.v
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfxbp.pp.functional.v"
+`include "sky130_fd_sc_hd__dfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp.v b/cells/dfxtp/sky130_fd_sc_hd__dfxtp.v
index 7bf89c5..6200f50 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp.v
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dfxtp.pp.functional.v"
+`include "sky130_fd_sc_hd__dfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/diode/sky130_fd_sc_hd__diode.v b/cells/diode/sky130_fd_sc_hd__diode.v
index 16d1740..e4bae0a 100644
--- a/cells/diode/sky130_fd_sc_hd__diode.v
+++ b/cells/diode/sky130_fd_sc_hd__diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__diode.pp.functional.v"
+`include "sky130_fd_sc_hd__diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__diode.pp.behavioral.v"
+`include "sky130_fd_sc_hd__diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp.v b/cells/dlclkp/sky130_fd_sc_hd__dlclkp.v
index 3e82f9f..2910a51 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp.v
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlclkp.pp.functional.v"
+`include "sky130_fd_sc_hd__dlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn.v b/cells/dlrbn/sky130_fd_sc_hd__dlrbn.v
index a9ef436..687ba34 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn.v
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlrbn.pp.functional.v"
+`include "sky130_fd_sc_hd__dlrbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlrbn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlrbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp.v b/cells/dlrbp/sky130_fd_sc_hd__dlrbp.v
index eb8e4c7..36a92d9 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp.v
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlrbp.pp.functional.v"
+`include "sky130_fd_sc_hd__dlrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn.v b/cells/dlrtn/sky130_fd_sc_hd__dlrtn.v
index dc5296b..54bac69 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn.v
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlrtn.pp.functional.v"
+`include "sky130_fd_sc_hd__dlrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlrtn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp.v b/cells/dlrtp/sky130_fd_sc_hd__dlrtp.v
index e28630a..016b065 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp.v
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlrtp.pp.functional.v"
+`include "sky130_fd_sc_hd__dlrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn.v b/cells/dlxbn/sky130_fd_sc_hd__dlxbn.v
index 0642fea..f2777ab 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn.v
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlxbn.pp.functional.v"
+`include "sky130_fd_sc_hd__dlxbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlxbn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlxbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbp/sky130_fd_sc_hd__dlxbp.v b/cells/dlxbp/sky130_fd_sc_hd__dlxbp.v
index d6af23a..db06531 100644
--- a/cells/dlxbp/sky130_fd_sc_hd__dlxbp.v
+++ b/cells/dlxbp/sky130_fd_sc_hd__dlxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlxbp.pp.functional.v"
+`include "sky130_fd_sc_hd__dlxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn.v b/cells/dlxtn/sky130_fd_sc_hd__dlxtn.v
index 7ae34d0..ac1b885 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn.v
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlxtn.pp.functional.v"
+`include "sky130_fd_sc_hd__dlxtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlxtn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlxtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtp/sky130_fd_sc_hd__dlxtp.v b/cells/dlxtp/sky130_fd_sc_hd__dlxtp.v
index b92e567..d4976a0 100644
--- a/cells/dlxtp/sky130_fd_sc_hd__dlxtp.v
+++ b/cells/dlxtp/sky130_fd_sc_hd__dlxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlxtp.pp.functional.v"
+`include "sky130_fd_sc_hd__dlxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1.v b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1.v
index 7638bfb..103aeb5 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlygate4sd1.pp.functional.v"
+`include "sky130_fd_sc_hd__dlygate4sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlygate4sd1.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlygate4sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2.v b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2.v
index e211d4c..080c05b 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlygate4sd2.pp.functional.v"
+`include "sky130_fd_sc_hd__dlygate4sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlygate4sd2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlygate4sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3.v b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3.v
index c75bf2b..c48e5af 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlygate4sd3.pp.functional.v"
+`include "sky130_fd_sc_hd__dlygate4sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlygate4sd3.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlygate4sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s.v b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s.v
index a78bebe..a720044 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlymetal6s2s.pp.functional.v"
+`include "sky130_fd_sc_hd__dlymetal6s2s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlymetal6s2s.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlymetal6s2s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s.v b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s.v
index 711f37b..adee991 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlymetal6s4s.pp.functional.v"
+`include "sky130_fd_sc_hd__dlymetal6s4s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlymetal6s4s.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlymetal6s4s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s.v b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s.v
index 31e7b32..4a49c4a 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__dlymetal6s6s.pp.functional.v"
+`include "sky130_fd_sc_hd__dlymetal6s6s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__dlymetal6s6s.pp.behavioral.v"
+`include "sky130_fd_sc_hd__dlymetal6s6s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn.v b/cells/ebufn/sky130_fd_sc_hd__ebufn.v
index 9d286d6..76d1977 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn.v
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__ebufn.pp.functional.v"
+`include "sky130_fd_sc_hd__ebufn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__ebufn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__ebufn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxbp/sky130_fd_sc_hd__edfxbp.v b/cells/edfxbp/sky130_fd_sc_hd__edfxbp.v
index e831a86..b658c82 100644
--- a/cells/edfxbp/sky130_fd_sc_hd__edfxbp.v
+++ b/cells/edfxbp/sky130_fd_sc_hd__edfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__edfxbp.pp.functional.v"
+`include "sky130_fd_sc_hd__edfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__edfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__edfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxtp/sky130_fd_sc_hd__edfxtp.v b/cells/edfxtp/sky130_fd_sc_hd__edfxtp.v
index ee5530e..b1929db 100644
--- a/cells/edfxtp/sky130_fd_sc_hd__edfxtp.v
+++ b/cells/edfxtp/sky130_fd_sc_hd__edfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__edfxtp.pp.functional.v"
+`include "sky130_fd_sc_hd__edfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__edfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__edfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn.v b/cells/einvn/sky130_fd_sc_hd__einvn.v
index 51fbabe..ec5b345 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn.v
+++ b/cells/einvn/sky130_fd_sc_hd__einvn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__einvn.pp.functional.v"
+`include "sky130_fd_sc_hd__einvn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__einvn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__einvn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp.v b/cells/einvp/sky130_fd_sc_hd__einvp.v
index 7e90451..a645478 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp.v
+++ b/cells/einvp/sky130_fd_sc_hd__einvp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__einvp.pp.functional.v"
+`include "sky130_fd_sc_hd__einvp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__einvp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__einvp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fa/sky130_fd_sc_hd__fa.v b/cells/fa/sky130_fd_sc_hd__fa.v
index 70c09cc..94926da 100644
--- a/cells/fa/sky130_fd_sc_hd__fa.v
+++ b/cells/fa/sky130_fd_sc_hd__fa.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__fa.pp.functional.v"
+`include "sky130_fd_sc_hd__fa.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__fa.pp.behavioral.v"
+`include "sky130_fd_sc_hd__fa.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fah/sky130_fd_sc_hd__fah.v b/cells/fah/sky130_fd_sc_hd__fah.v
index 73eacb2..23dd231 100644
--- a/cells/fah/sky130_fd_sc_hd__fah.v
+++ b/cells/fah/sky130_fd_sc_hd__fah.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__fah.pp.functional.v"
+`include "sky130_fd_sc_hd__fah.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__fah.pp.behavioral.v"
+`include "sky130_fd_sc_hd__fah.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcin/sky130_fd_sc_hd__fahcin.v b/cells/fahcin/sky130_fd_sc_hd__fahcin.v
index 5d31a2e..f2375bb 100644
--- a/cells/fahcin/sky130_fd_sc_hd__fahcin.v
+++ b/cells/fahcin/sky130_fd_sc_hd__fahcin.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__fahcin.pp.functional.v"
+`include "sky130_fd_sc_hd__fahcin.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__fahcin.pp.behavioral.v"
+`include "sky130_fd_sc_hd__fahcin.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcon/sky130_fd_sc_hd__fahcon.v b/cells/fahcon/sky130_fd_sc_hd__fahcon.v
index fc19279..6b38a15 100644
--- a/cells/fahcon/sky130_fd_sc_hd__fahcon.v
+++ b/cells/fahcon/sky130_fd_sc_hd__fahcon.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__fahcon.pp.functional.v"
+`include "sky130_fd_sc_hd__fahcon.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__fahcon.pp.behavioral.v"
+`include "sky130_fd_sc_hd__fahcon.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill/sky130_fd_sc_hd__fill.v b/cells/fill/sky130_fd_sc_hd__fill.v
index 524269c..92c6be9 100644
--- a/cells/fill/sky130_fd_sc_hd__fill.v
+++ b/cells/fill/sky130_fd_sc_hd__fill.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__fill.pp.functional.v"
+`include "sky130_fd_sc_hd__fill.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__fill.pp.behavioral.v"
+`include "sky130_fd_sc_hd__fill.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ha/sky130_fd_sc_hd__ha.v b/cells/ha/sky130_fd_sc_hd__ha.v
index d1640ed..6c445ce 100644
--- a/cells/ha/sky130_fd_sc_hd__ha.v
+++ b/cells/ha/sky130_fd_sc_hd__ha.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__ha.pp.functional.v"
+`include "sky130_fd_sc_hd__ha.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__ha.pp.behavioral.v"
+`include "sky130_fd_sc_hd__ha.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inv/sky130_fd_sc_hd__inv.v b/cells/inv/sky130_fd_sc_hd__inv.v
index e01859e..693519b 100644
--- a/cells/inv/sky130_fd_sc_hd__inv.v
+++ b/cells/inv/sky130_fd_sc_hd__inv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__inv.pp.functional.v"
+`include "sky130_fd_sc_hd__inv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__inv.pp.behavioral.v"
+`include "sky130_fd_sc_hd__inv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder.v b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder.v
index bf9be8e..3fae503 100644
--- a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder.v
+++ b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_bleeder.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_bleeder.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_bleeder.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_bleeder.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr.v b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr.v
index 60bc630..8f3633f 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr.v
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_clkbufkapwr.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_clkbufkapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_clkbufkapwr.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_clkbufkapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr.v b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr.v
index 3f44bc8..76dd0f7 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr.v
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_clkinvkapwr.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_clkinvkapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_clkinvkapwr.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_clkinvkapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr.v b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr.v
index 5d973a7..ac55484 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr.v
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_decapkapwr.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_decapkapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_decapkapwr.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_decapkapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n.v b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n.v
index e8f407f..5d105a3 100644
--- a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n.v
+++ b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputiso0n.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_inputiso0n.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputiso0n.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_inputiso0n.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p.v b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p.v
index efc33a6..fcf98e6 100644
--- a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p.v
+++ b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputiso0p.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_inputiso0p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputiso0p.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_inputiso0p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n.v b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n.v
index d5a887a..55f7321 100644
--- a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n.v
+++ b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputiso1n.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_inputiso1n.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputiso1n.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_inputiso1n.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p.v b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p.v
index 0cd45a2..83f6f7a 100644
--- a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p.v
+++ b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputiso1p.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_inputiso1p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputiso1p.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_inputiso1p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch.v b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch.v
index b6ac420..2efac49 100644
--- a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch.v
+++ b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputisolatch.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_inputisolatch.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_inputisolatch.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_inputisolatch.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc.v b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc.v
index fd873cf..f200afb 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc.v
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_isobufsrc.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_isobufsrc.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_isobufsrc.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_isobufsrc.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr.v b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr.v
index 97e9a80..4a05faa 100644
--- a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr.v
+++ b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_isobufsrckapwr.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_isobufsrckapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_isobufsrckapwr.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_isobufsrckapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap.v b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap.v
index 745d1ac..cb37650 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap.v
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell.v b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell.v
index 3302bf9..bdc956c 100644
--- a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell.v
+++ b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap.v b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap.v
index d6a6c19..de62c2b 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap.v
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap.pp.functional.v"
+`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap.pp.behavioral.v"
+`include "sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.v b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.v
index f63559b..08341fc 100644
--- a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.v
+++ b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__macro_sparecell.pp.functional.v"
+`include "sky130_fd_sc_hd__macro_sparecell.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__macro_sparecell.pp.behavioral.v"
+`include "sky130_fd_sc_hd__macro_sparecell.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3.v b/cells/maj3/sky130_fd_sc_hd__maj3.v
index 1fd312e..a436ab1 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3.v
+++ b/cells/maj3/sky130_fd_sc_hd__maj3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__maj3.pp.functional.v"
+`include "sky130_fd_sc_hd__maj3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__maj3.pp.behavioral.v"
+`include "sky130_fd_sc_hd__maj3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2.v b/cells/mux2/sky130_fd_sc_hd__mux2.v
index c647a47..c668e29 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2.v
+++ b/cells/mux2/sky130_fd_sc_hd__mux2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__mux2.pp.functional.v"
+`include "sky130_fd_sc_hd__mux2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__mux2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__mux2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i.v b/cells/mux2i/sky130_fd_sc_hd__mux2i.v
index 6dcc839..158c4f2 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i.v
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__mux2i.pp.functional.v"
+`include "sky130_fd_sc_hd__mux2i.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__mux2i.pp.behavioral.v"
+`include "sky130_fd_sc_hd__mux2i.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4.v b/cells/mux4/sky130_fd_sc_hd__mux4.v
index e30c02f..018bd7a 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4.v
+++ b/cells/mux4/sky130_fd_sc_hd__mux4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__mux4.pp.functional.v"
+`include "sky130_fd_sc_hd__mux4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__mux4.pp.behavioral.v"
+`include "sky130_fd_sc_hd__mux4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2.v b/cells/nand2/sky130_fd_sc_hd__nand2.v
index d15aca6..a5722d9 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2.v
+++ b/cells/nand2/sky130_fd_sc_hd__nand2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nand2.pp.functional.v"
+`include "sky130_fd_sc_hd__nand2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nand2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nand2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b.v b/cells/nand2b/sky130_fd_sc_hd__nand2b.v
index ccc041e..124a199 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b.v
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nand2b.pp.functional.v"
+`include "sky130_fd_sc_hd__nand2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nand2b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nand2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3.v b/cells/nand3/sky130_fd_sc_hd__nand3.v
index 94adb5a..8e7c6fb 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3.v
+++ b/cells/nand3/sky130_fd_sc_hd__nand3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nand3.pp.functional.v"
+`include "sky130_fd_sc_hd__nand3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nand3.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nand3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b.v b/cells/nand3b/sky130_fd_sc_hd__nand3b.v
index 32c6de7..d3ae8a7 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b.v
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nand3b.pp.functional.v"
+`include "sky130_fd_sc_hd__nand3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nand3b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nand3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4.v b/cells/nand4/sky130_fd_sc_hd__nand4.v
index ebb2bb7..a2cd5eb 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4.v
+++ b/cells/nand4/sky130_fd_sc_hd__nand4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nand4.pp.functional.v"
+`include "sky130_fd_sc_hd__nand4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nand4.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nand4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b.v b/cells/nand4b/sky130_fd_sc_hd__nand4b.v
index 623021f..8e956c1 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b.v
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nand4b.pp.functional.v"
+`include "sky130_fd_sc_hd__nand4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nand4b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nand4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb.v b/cells/nand4bb/sky130_fd_sc_hd__nand4bb.v
index cc5bbf5..07110e2 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb.v
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nand4bb.pp.functional.v"
+`include "sky130_fd_sc_hd__nand4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nand4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nand4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2.v b/cells/nor2/sky130_fd_sc_hd__nor2.v
index a92a667..c61e7ad 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2.v
+++ b/cells/nor2/sky130_fd_sc_hd__nor2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nor2.pp.functional.v"
+`include "sky130_fd_sc_hd__nor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nor2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b.v b/cells/nor2b/sky130_fd_sc_hd__nor2b.v
index ccda787..c5da96b 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b.v
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nor2b.pp.functional.v"
+`include "sky130_fd_sc_hd__nor2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nor2b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nor2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3.v b/cells/nor3/sky130_fd_sc_hd__nor3.v
index dc40693..7a38434 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3.v
+++ b/cells/nor3/sky130_fd_sc_hd__nor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nor3.pp.functional.v"
+`include "sky130_fd_sc_hd__nor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nor3.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b.v b/cells/nor3b/sky130_fd_sc_hd__nor3b.v
index de81e98..2678c6a 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b.v
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nor3b.pp.functional.v"
+`include "sky130_fd_sc_hd__nor3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nor3b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nor3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4.v b/cells/nor4/sky130_fd_sc_hd__nor4.v
index 1d68717..c02af3c 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4.v
+++ b/cells/nor4/sky130_fd_sc_hd__nor4.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nor4.pp.functional.v"
+`include "sky130_fd_sc_hd__nor4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nor4.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nor4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b.v b/cells/nor4b/sky130_fd_sc_hd__nor4b.v
index 11f358c..bb80a4b 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b.v
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nor4b.pp.functional.v"
+`include "sky130_fd_sc_hd__nor4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nor4b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nor4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb.v b/cells/nor4bb/sky130_fd_sc_hd__nor4bb.v
index 930773e..be6b2e5 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb.v
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__nor4bb.pp.functional.v"
+`include "sky130_fd_sc_hd__nor4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__nor4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hd__nor4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a.v b/cells/o2111a/sky130_fd_sc_hd__o2111a.v
index c43cbab..d8b9257 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a.v
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o2111a.pp.functional.v"
+`include "sky130_fd_sc_hd__o2111a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o2111a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o2111a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai.v b/cells/o2111ai/sky130_fd_sc_hd__o2111ai.v
index 553e8a4..baf0db5 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai.v
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o2111ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o2111ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o2111ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o2111ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a.v b/cells/o211a/sky130_fd_sc_hd__o211a.v
index fa3efb3..87689e6 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a.v
+++ b/cells/o211a/sky130_fd_sc_hd__o211a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o211a.pp.functional.v"
+`include "sky130_fd_sc_hd__o211a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o211a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o211a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai.v b/cells/o211ai/sky130_fd_sc_hd__o211ai.v
index fce39a0..eb119ca 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai.v
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o211ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o211ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o211ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o211ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a.v b/cells/o21a/sky130_fd_sc_hd__o21a.v
index 97c106c..dd9016d 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a.v
+++ b/cells/o21a/sky130_fd_sc_hd__o21a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o21a.pp.functional.v"
+`include "sky130_fd_sc_hd__o21a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o21a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o21a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai.v b/cells/o21ai/sky130_fd_sc_hd__o21ai.v
index a2acbb2..a9784dd 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai.v
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o21ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o21ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o21ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o21ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba.v b/cells/o21ba/sky130_fd_sc_hd__o21ba.v
index 8674331..7d468ef 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba.v
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o21ba.pp.functional.v"
+`include "sky130_fd_sc_hd__o21ba.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o21ba.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o21ba.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai.v b/cells/o21bai/sky130_fd_sc_hd__o21bai.v
index ab8cb75..dc02f52 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai.v
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o21bai.pp.functional.v"
+`include "sky130_fd_sc_hd__o21bai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o21bai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o21bai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a.v b/cells/o221a/sky130_fd_sc_hd__o221a.v
index 14a140c..0060ece 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a.v
+++ b/cells/o221a/sky130_fd_sc_hd__o221a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o221a.pp.functional.v"
+`include "sky130_fd_sc_hd__o221a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o221a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o221a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai.v b/cells/o221ai/sky130_fd_sc_hd__o221ai.v
index a9bc4f5..7d0bdeb 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai.v
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o221ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o221ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o221ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o221ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a.v b/cells/o22a/sky130_fd_sc_hd__o22a.v
index 7259ded..64f0a09 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a.v
+++ b/cells/o22a/sky130_fd_sc_hd__o22a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o22a.pp.functional.v"
+`include "sky130_fd_sc_hd__o22a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o22a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o22a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai.v b/cells/o22ai/sky130_fd_sc_hd__o22ai.v
index e080b34..b9b9a09 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai.v
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o22ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o22ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o22ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o22ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a.v b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a.v
index 30c6a10..77425af 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a.v
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o2bb2a.pp.functional.v"
+`include "sky130_fd_sc_hd__o2bb2a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o2bb2a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o2bb2a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai.v b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai.v
index 4ea6858..dee98ab 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o2bb2ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o2bb2ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o2bb2ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o2bb2ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a.v b/cells/o311a/sky130_fd_sc_hd__o311a.v
index 22cfb8a..7f95771 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a.v
+++ b/cells/o311a/sky130_fd_sc_hd__o311a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o311a.pp.functional.v"
+`include "sky130_fd_sc_hd__o311a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o311a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o311a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai.v b/cells/o311ai/sky130_fd_sc_hd__o311ai.v
index bcbc051..0dd9ea4 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai.v
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o311ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o311ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o311ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o311ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a.v b/cells/o31a/sky130_fd_sc_hd__o31a.v
index 81b8d48..9de149c 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a.v
+++ b/cells/o31a/sky130_fd_sc_hd__o31a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o31a.pp.functional.v"
+`include "sky130_fd_sc_hd__o31a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o31a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o31a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai.v b/cells/o31ai/sky130_fd_sc_hd__o31ai.v
index ebde4af..67a2f56 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai.v
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o31ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o31ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o31ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o31ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a.v b/cells/o32a/sky130_fd_sc_hd__o32a.v
index e0aa61d..68c1915 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a.v
+++ b/cells/o32a/sky130_fd_sc_hd__o32a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o32a.pp.functional.v"
+`include "sky130_fd_sc_hd__o32a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o32a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o32a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai.v b/cells/o32ai/sky130_fd_sc_hd__o32ai.v
index 9b7efeb..f6441b1 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai.v
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o32ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o32ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o32ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o32ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a.v b/cells/o41a/sky130_fd_sc_hd__o41a.v
index e4c2d59..6ec9bc2 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a.v
+++ b/cells/o41a/sky130_fd_sc_hd__o41a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o41a.pp.functional.v"
+`include "sky130_fd_sc_hd__o41a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o41a.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o41a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai.v b/cells/o41ai/sky130_fd_sc_hd__o41ai.v
index 568e904..4076f4f 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai.v
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__o41ai.pp.functional.v"
+`include "sky130_fd_sc_hd__o41ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__o41ai.pp.behavioral.v"
+`include "sky130_fd_sc_hd__o41ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2/sky130_fd_sc_hd__or2.v b/cells/or2/sky130_fd_sc_hd__or2.v
index d1bdf0b..83c0aed 100644
--- a/cells/or2/sky130_fd_sc_hd__or2.v
+++ b/cells/or2/sky130_fd_sc_hd__or2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__or2.pp.functional.v"
+`include "sky130_fd_sc_hd__or2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__or2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__or2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b.v b/cells/or2b/sky130_fd_sc_hd__or2b.v
index 72a7399..ce95bd6 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b.v
+++ b/cells/or2b/sky130_fd_sc_hd__or2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__or2b.pp.functional.v"
+`include "sky130_fd_sc_hd__or2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__or2b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__or2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3/sky130_fd_sc_hd__or3.v b/cells/or3/sky130_fd_sc_hd__or3.v
index 820b9f6..63318e7 100644
--- a/cells/or3/sky130_fd_sc_hd__or3.v
+++ b/cells/or3/sky130_fd_sc_hd__or3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__or3.pp.functional.v"
+`include "sky130_fd_sc_hd__or3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__or3.pp.behavioral.v"
+`include "sky130_fd_sc_hd__or3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b.v b/cells/or3b/sky130_fd_sc_hd__or3b.v
index 4bbae7b..917bd0b 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b.v
+++ b/cells/or3b/sky130_fd_sc_hd__or3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__or3b.pp.functional.v"
+`include "sky130_fd_sc_hd__or3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__or3b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__or3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4/sky130_fd_sc_hd__or4.v b/cells/or4/sky130_fd_sc_hd__or4.v
index ccc9238..9843e6d 100644
--- a/cells/or4/sky130_fd_sc_hd__or4.v
+++ b/cells/or4/sky130_fd_sc_hd__or4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__or4.pp.functional.v"
+`include "sky130_fd_sc_hd__or4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__or4.pp.behavioral.v"
+`include "sky130_fd_sc_hd__or4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b.v b/cells/or4b/sky130_fd_sc_hd__or4b.v
index e796431..77bb01a 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b.v
+++ b/cells/or4b/sky130_fd_sc_hd__or4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__or4b.pp.functional.v"
+`include "sky130_fd_sc_hd__or4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__or4b.pp.behavioral.v"
+`include "sky130_fd_sc_hd__or4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb.v b/cells/or4bb/sky130_fd_sc_hd__or4bb.v
index 0256e4a..1183a60 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb.v
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__or4bb.pp.functional.v"
+`include "sky130_fd_sc_hd__or4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__or4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hd__or4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/probe_p/sky130_fd_sc_hd__probe_p.v b/cells/probe_p/sky130_fd_sc_hd__probe_p.v
index d25a51f..bb0c308 100644
--- a/cells/probe_p/sky130_fd_sc_hd__probe_p.v
+++ b/cells/probe_p/sky130_fd_sc_hd__probe_p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__probe_p.pp.functional.v"
+`include "sky130_fd_sc_hd__probe_p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__probe_p.pp.behavioral.v"
+`include "sky130_fd_sc_hd__probe_p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/probec_p/sky130_fd_sc_hd__probec_p.v b/cells/probec_p/sky130_fd_sc_hd__probec_p.v
index c20943b..3052913 100644
--- a/cells/probec_p/sky130_fd_sc_hd__probec_p.v
+++ b/cells/probec_p/sky130_fd_sc_hd__probec_p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__probec_p.pp.functional.v"
+`include "sky130_fd_sc_hd__probec_p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__probec_p.pp.behavioral.v"
+`include "sky130_fd_sc_hd__probec_p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn.v b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn.v
index 0d192b8..d00c130 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn.v
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfbbn.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp.v b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp.v
index 3aa4c20..64ce014 100644
--- a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp.v
+++ b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfbbp.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp.v b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp.v
index b47891b..18193c2 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp.v
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfrbp.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn.v b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn.v
index 55ba463..a72cba7 100644
--- a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn.v
+++ b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfrtn.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp.v b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp.v
index e9a8ed6..94a536d 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp.v
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfrtp.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp.v b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp.v
index aeed5b1..199b09a 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp.v
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfsbp.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp.v b/cells/sdfstp/sky130_fd_sc_hd__sdfstp.v
index 6de205f..0842b41 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp.v
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfstp.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfstp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp.v b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp.v
index 2190464..3d3520c 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp.v
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfxbp.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp.v b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp.v
index bea5028..50a3a87 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp.v
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfxtp.pp.functional.v"
+`include "sky130_fd_sc_hd__sdfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp.v b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp.v
index 25b678c..fa1fd7e 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp.v
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sdlclkp.pp.functional.v"
+`include "sky130_fd_sc_hd__sdlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sdlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sdlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp.v b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp.v
index 7b72459..733aa03 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp.v
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sedfxbp.pp.functional.v"
+`include "sky130_fd_sc_hd__sedfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sedfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sedfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp.v b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp.v
index dae6a4c..7616945 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp.v
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__sedfxtp.pp.functional.v"
+`include "sky130_fd_sc_hd__sedfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__sedfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hd__sedfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tap/sky130_fd_sc_hd__tap.v b/cells/tap/sky130_fd_sc_hd__tap.v
index fde9a6c..d91e9ce 100644
--- a/cells/tap/sky130_fd_sc_hd__tap.v
+++ b/cells/tap/sky130_fd_sc_hd__tap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__tap.pp.functional.v"
+`include "sky130_fd_sc_hd__tap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__tap.pp.behavioral.v"
+`include "sky130_fd_sc_hd__tap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd.v b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd.v
index cba1765..6524722 100644
--- a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd.v
+++ b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__tapvgnd.pp.functional.v"
+`include "sky130_fd_sc_hd__tapvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__tapvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_hd__tapvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2.v b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2.v
index 62fdd57..85b9e17 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2.v
+++ b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__tapvgnd2.pp.functional.v"
+`include "sky130_fd_sc_hd__tapvgnd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__tapvgnd2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__tapvgnd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd.v b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd.v
index 3a2df96..18a1681 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__tapvpwrvgnd.pp.functional.v"
+`include "sky130_fd_sc_hd__tapvpwrvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__tapvpwrvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_hd__tapvpwrvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2.v b/cells/xnor2/sky130_fd_sc_hd__xnor2.v
index c8182e1..fb06b79 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2.v
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__xnor2.pp.functional.v"
+`include "sky130_fd_sc_hd__xnor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__xnor2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__xnor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3.v b/cells/xnor3/sky130_fd_sc_hd__xnor3.v
index 5b4d210..7881442 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3.v
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__xnor3.pp.functional.v"
+`include "sky130_fd_sc_hd__xnor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__xnor3.pp.behavioral.v"
+`include "sky130_fd_sc_hd__xnor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2.v b/cells/xor2/sky130_fd_sc_hd__xor2.v
index 21ff79f..3aba28b 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2.v
+++ b/cells/xor2/sky130_fd_sc_hd__xor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__xor2.pp.functional.v"
+`include "sky130_fd_sc_hd__xor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__xor2.pp.behavioral.v"
+`include "sky130_fd_sc_hd__xor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3.v b/cells/xor3/sky130_fd_sc_hd__xor3.v
index 12c7905..9f76679 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3.v
+++ b/cells/xor3/sky130_fd_sc_hd__xor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hd__xor3.pp.functional.v"
+`include "sky130_fd_sc_hd__xor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hd__xor3.pp.behavioral.v"
+`include "sky130_fd_sc_hd__xor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS