diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o.v b/cells/a2111o/sky130_fd_sc_hs__a2111o.v
index cdadee1..57dbd91 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o.v
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a2111o.pp.functional.v"
+`include "sky130_fd_sc_hs__a2111o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a2111o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a2111o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi.v b/cells/a2111oi/sky130_fd_sc_hs__a2111oi.v
index 334caed..e9e5ad4 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi.v
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a2111oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a2111oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a2111oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a2111oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o.v b/cells/a211o/sky130_fd_sc_hs__a211o.v
index 5f373fb..d145f9b 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o.v
+++ b/cells/a211o/sky130_fd_sc_hs__a211o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a211o.pp.functional.v"
+`include "sky130_fd_sc_hs__a211o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a211o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a211o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi.v b/cells/a211oi/sky130_fd_sc_hs__a211oi.v
index 8705362..4d37401 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi.v
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a211oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a211oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a211oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a211oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo.v b/cells/a21bo/sky130_fd_sc_hs__a21bo.v
index 1180339..f83e1b3 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo.v
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a21bo.pp.functional.v"
+`include "sky130_fd_sc_hs__a21bo.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a21bo.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a21bo.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi.v b/cells/a21boi/sky130_fd_sc_hs__a21boi.v
index 097e77c..7f99225 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi.v
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a21boi.pp.functional.v"
+`include "sky130_fd_sc_hs__a21boi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a21boi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a21boi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o.v b/cells/a21o/sky130_fd_sc_hs__a21o.v
index 7371c1c..640e844 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o.v
+++ b/cells/a21o/sky130_fd_sc_hs__a21o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a21o.pp.functional.v"
+`include "sky130_fd_sc_hs__a21o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a21o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a21o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi.v b/cells/a21oi/sky130_fd_sc_hs__a21oi.v
index bed1fb3..83fa345 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi.v
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a21oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a21oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a21oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a21oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o.v b/cells/a221o/sky130_fd_sc_hs__a221o.v
index 0a9de62..fb41712 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o.v
+++ b/cells/a221o/sky130_fd_sc_hs__a221o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a221o.pp.functional.v"
+`include "sky130_fd_sc_hs__a221o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a221o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a221o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi.v b/cells/a221oi/sky130_fd_sc_hs__a221oi.v
index fc72f0d..f8ebffb 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi.v
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a221oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a221oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a221oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a221oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o.v b/cells/a222o/sky130_fd_sc_hs__a222o.v
index fd73b23..ca62097 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o.v
+++ b/cells/a222o/sky130_fd_sc_hs__a222o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a222o.pp.functional.v"
+`include "sky130_fd_sc_hs__a222o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a222o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a222o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi.v b/cells/a222oi/sky130_fd_sc_hs__a222oi.v
index e197209..0956d20 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi.v
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a222oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a222oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a222oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a222oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o.v b/cells/a22o/sky130_fd_sc_hs__a22o.v
index 35b1c14..9efdd4c 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o.v
+++ b/cells/a22o/sky130_fd_sc_hs__a22o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a22o.pp.functional.v"
+`include "sky130_fd_sc_hs__a22o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a22o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a22o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi.v b/cells/a22oi/sky130_fd_sc_hs__a22oi.v
index 00b5321..3146f99 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi.v
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a22oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a22oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a22oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a22oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o.v b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o.v
index c328560..93380bc 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o.v
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a2bb2o.pp.functional.v"
+`include "sky130_fd_sc_hs__a2bb2o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a2bb2o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a2bb2o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi.v b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi.v
index 093fa61..92ed8ad 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a2bb2oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a2bb2oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a2bb2oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a2bb2oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o.v b/cells/a311o/sky130_fd_sc_hs__a311o.v
index bfa40e3..6fdc854 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o.v
+++ b/cells/a311o/sky130_fd_sc_hs__a311o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a311o.pp.functional.v"
+`include "sky130_fd_sc_hs__a311o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a311o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a311o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi.v b/cells/a311oi/sky130_fd_sc_hs__a311oi.v
index 4c97780..b93521a 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi.v
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a311oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a311oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a311oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a311oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o.v b/cells/a31o/sky130_fd_sc_hs__a31o.v
index 67d2807..2f94589 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o.v
+++ b/cells/a31o/sky130_fd_sc_hs__a31o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a31o.pp.functional.v"
+`include "sky130_fd_sc_hs__a31o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a31o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a31o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi.v b/cells/a31oi/sky130_fd_sc_hs__a31oi.v
index a5eae6d..f69916d 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi.v
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a31oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a31oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a31oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a31oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o.v b/cells/a32o/sky130_fd_sc_hs__a32o.v
index 2621e72..c25c77b 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o.v
+++ b/cells/a32o/sky130_fd_sc_hs__a32o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a32o.pp.functional.v"
+`include "sky130_fd_sc_hs__a32o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a32o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a32o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi.v b/cells/a32oi/sky130_fd_sc_hs__a32oi.v
index f9ade50..c83a259 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi.v
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a32oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a32oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a32oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a32oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o.v b/cells/a41o/sky130_fd_sc_hs__a41o.v
index 8022fa2..28f2fb5 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o.v
+++ b/cells/a41o/sky130_fd_sc_hs__a41o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a41o.pp.functional.v"
+`include "sky130_fd_sc_hs__a41o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a41o.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a41o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi.v b/cells/a41oi/sky130_fd_sc_hs__a41oi.v
index 745ae9d..b0fe2cb 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi.v
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__a41oi.pp.functional.v"
+`include "sky130_fd_sc_hs__a41oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__a41oi.pp.behavioral.v"
+`include "sky130_fd_sc_hs__a41oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2/sky130_fd_sc_hs__and2.v b/cells/and2/sky130_fd_sc_hs__and2.v
index 620410c..29c7592 100644
--- a/cells/and2/sky130_fd_sc_hs__and2.v
+++ b/cells/and2/sky130_fd_sc_hs__and2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__and2.pp.functional.v"
+`include "sky130_fd_sc_hs__and2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__and2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__and2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b.v b/cells/and2b/sky130_fd_sc_hs__and2b.v
index 2d8c883..4fbf7c9 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b.v
+++ b/cells/and2b/sky130_fd_sc_hs__and2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__and2b.pp.functional.v"
+`include "sky130_fd_sc_hs__and2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__and2b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__and2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3/sky130_fd_sc_hs__and3.v b/cells/and3/sky130_fd_sc_hs__and3.v
index 2f6a2fd..0a4c1c7 100644
--- a/cells/and3/sky130_fd_sc_hs__and3.v
+++ b/cells/and3/sky130_fd_sc_hs__and3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__and3.pp.functional.v"
+`include "sky130_fd_sc_hs__and3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__and3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__and3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b.v b/cells/and3b/sky130_fd_sc_hs__and3b.v
index b6184d3..5e57d7e 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b.v
+++ b/cells/and3b/sky130_fd_sc_hs__and3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__and3b.pp.functional.v"
+`include "sky130_fd_sc_hs__and3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__and3b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__and3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4/sky130_fd_sc_hs__and4.v b/cells/and4/sky130_fd_sc_hs__and4.v
index 67cd746..611c5fd 100644
--- a/cells/and4/sky130_fd_sc_hs__and4.v
+++ b/cells/and4/sky130_fd_sc_hs__and4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__and4.pp.functional.v"
+`include "sky130_fd_sc_hs__and4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__and4.pp.behavioral.v"
+`include "sky130_fd_sc_hs__and4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b.v b/cells/and4b/sky130_fd_sc_hs__and4b.v
index 50e13e0..6675bad 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b.v
+++ b/cells/and4b/sky130_fd_sc_hs__and4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__and4b.pp.functional.v"
+`include "sky130_fd_sc_hs__and4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__and4b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__and4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb.v b/cells/and4bb/sky130_fd_sc_hs__and4bb.v
index 0a93520..e24f8cc 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb.v
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__and4bb.pp.functional.v"
+`include "sky130_fd_sc_hs__and4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__and4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hs__and4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/buf/sky130_fd_sc_hs__buf.v b/cells/buf/sky130_fd_sc_hs__buf.v
index 4f50e5d..f69ff47 100644
--- a/cells/buf/sky130_fd_sc_hs__buf.v
+++ b/cells/buf/sky130_fd_sc_hs__buf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__buf.pp.functional.v"
+`include "sky130_fd_sc_hs__buf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__buf.pp.behavioral.v"
+`include "sky130_fd_sc_hs__buf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf.v b/cells/bufbuf/sky130_fd_sc_hs__bufbuf.v
index 5ff774f..3dab015 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf.v
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__bufbuf.pp.functional.v"
+`include "sky130_fd_sc_hs__bufbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__bufbuf.pp.behavioral.v"
+`include "sky130_fd_sc_hs__bufbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv.v b/cells/bufinv/sky130_fd_sc_hs__bufinv.v
index 64ba9f5..b8318ac 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv.v
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__bufinv.pp.functional.v"
+`include "sky130_fd_sc_hs__bufinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__bufinv.pp.behavioral.v"
+`include "sky130_fd_sc_hs__bufinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf.v b/cells/clkbuf/sky130_fd_sc_hs__clkbuf.v
index 930457c..030a11c 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf.v
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__clkbuf.pp.functional.v"
+`include "sky130_fd_sc_hs__clkbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__clkbuf.pp.behavioral.v"
+`include "sky130_fd_sc_hs__clkbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1.v b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1.v
index 6d0409b..d67b1ef 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1.v
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv3sd1.pp.functional.v"
+`include "sky130_fd_sc_hs__clkdlyinv3sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv3sd1.pp.behavioral.v"
+`include "sky130_fd_sc_hs__clkdlyinv3sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2.v b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2.v
index 7333237..9bb6f4e 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2.v
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv3sd2.pp.functional.v"
+`include "sky130_fd_sc_hs__clkdlyinv3sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv3sd2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__clkdlyinv3sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3.v b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3.v
index d526aed..2082ca9 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3.v
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv3sd3.pp.functional.v"
+`include "sky130_fd_sc_hs__clkdlyinv3sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv3sd3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__clkdlyinv3sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1.v b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1.v
index 78dea7d..67da260 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1.v
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv5sd1.pp.functional.v"
+`include "sky130_fd_sc_hs__clkdlyinv5sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv5sd1.pp.behavioral.v"
+`include "sky130_fd_sc_hs__clkdlyinv5sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2.v b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2.v
index 582d74c..733e46d 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2.v
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv5sd2.pp.functional.v"
+`include "sky130_fd_sc_hs__clkdlyinv5sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv5sd2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__clkdlyinv5sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3.v b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3.v
index 14f60c2..fd9ad9a 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3.v
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv5sd3.pp.functional.v"
+`include "sky130_fd_sc_hs__clkdlyinv5sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__clkdlyinv5sd3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__clkdlyinv5sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv.v b/cells/clkinv/sky130_fd_sc_hs__clkinv.v
index fa6ba19..2b553ae 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv.v
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__clkinv.pp.functional.v"
+`include "sky130_fd_sc_hs__clkinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__clkinv.pp.behavioral.v"
+`include "sky130_fd_sc_hs__clkinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/conb/sky130_fd_sc_hs__conb.v b/cells/conb/sky130_fd_sc_hs__conb.v
index 67cda0a..737c5db 100644
--- a/cells/conb/sky130_fd_sc_hs__conb.v
+++ b/cells/conb/sky130_fd_sc_hs__conb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__conb.pp.functional.v"
+`include "sky130_fd_sc_hs__conb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__conb.pp.behavioral.v"
+`include "sky130_fd_sc_hs__conb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decap/sky130_fd_sc_hs__decap.v b/cells/decap/sky130_fd_sc_hs__decap.v
index cf450b5..b37b61a 100644
--- a/cells/decap/sky130_fd_sc_hs__decap.v
+++ b/cells/decap/sky130_fd_sc_hs__decap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__decap.pp.functional.v"
+`include "sky130_fd_sc_hs__decap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__decap.pp.behavioral.v"
+`include "sky130_fd_sc_hs__decap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn.v b/cells/dfbbn/sky130_fd_sc_hs__dfbbn.v
index cdf98f8..cbf972e 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn.v
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfbbn.pp.functional.v"
+`include "sky130_fd_sc_hs__dfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbp/sky130_fd_sc_hs__dfbbp.v b/cells/dfbbp/sky130_fd_sc_hs__dfbbp.v
index 5eb599a..f51102d 100644
--- a/cells/dfbbp/sky130_fd_sc_hs__dfbbp.v
+++ b/cells/dfbbp/sky130_fd_sc_hs__dfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfbbp.pp.functional.v"
+`include "sky130_fd_sc_hs__dfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp.v b/cells/dfrbp/sky130_fd_sc_hs__dfrbp.v
index e392e2c..513a5ef 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp.v
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfrbp.pp.functional.v"
+`include "sky130_fd_sc_hs__dfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtn/sky130_fd_sc_hs__dfrtn.v b/cells/dfrtn/sky130_fd_sc_hs__dfrtn.v
index 46d3475..ed22780 100644
--- a/cells/dfrtn/sky130_fd_sc_hs__dfrtn.v
+++ b/cells/dfrtn/sky130_fd_sc_hs__dfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfrtn.pp.functional.v"
+`include "sky130_fd_sc_hs__dfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp.v b/cells/dfrtp/sky130_fd_sc_hs__dfrtp.v
index d126feb..c5b4f99 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp.v
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfrtp.pp.functional.v"
+`include "sky130_fd_sc_hs__dfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp.v b/cells/dfsbp/sky130_fd_sc_hs__dfsbp.v
index 515a5e7..5a5f1f9 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp.v
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfsbp.pp.functional.v"
+`include "sky130_fd_sc_hs__dfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp.v b/cells/dfstp/sky130_fd_sc_hs__dfstp.v
index b3f150b..bc5e521 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp.v
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfstp.pp.functional.v"
+`include "sky130_fd_sc_hs__dfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfstp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp.v b/cells/dfxbp/sky130_fd_sc_hs__dfxbp.v
index 5a34d05..6de02ba 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp.v
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfxbp.pp.functional.v"
+`include "sky130_fd_sc_hs__dfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp.v b/cells/dfxtp/sky130_fd_sc_hs__dfxtp.v
index f537eb2..f52dca2 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp.v
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dfxtp.pp.functional.v"
+`include "sky130_fd_sc_hs__dfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/diode/sky130_fd_sc_hs__diode.v b/cells/diode/sky130_fd_sc_hs__diode.v
index a377530..1129034 100644
--- a/cells/diode/sky130_fd_sc_hs__diode.v
+++ b/cells/diode/sky130_fd_sc_hs__diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__diode.pp.functional.v"
+`include "sky130_fd_sc_hs__diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__diode.pp.behavioral.v"
+`include "sky130_fd_sc_hs__diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp.v b/cells/dlclkp/sky130_fd_sc_hs__dlclkp.v
index 2715960..3e55dfd 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp.v
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlclkp.pp.functional.v"
+`include "sky130_fd_sc_hs__dlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn.v b/cells/dlrbn/sky130_fd_sc_hs__dlrbn.v
index f99d409..d171ed6 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn.v
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlrbn.pp.functional.v"
+`include "sky130_fd_sc_hs__dlrbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlrbn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlrbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp.v b/cells/dlrbp/sky130_fd_sc_hs__dlrbp.v
index 179d6b2..e179a3d 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp.v
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlrbp.pp.functional.v"
+`include "sky130_fd_sc_hs__dlrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn.v b/cells/dlrtn/sky130_fd_sc_hs__dlrtn.v
index 2303147..403ef60 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn.v
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlrtn.pp.functional.v"
+`include "sky130_fd_sc_hs__dlrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlrtn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp.v b/cells/dlrtp/sky130_fd_sc_hs__dlrtp.v
index 34a1669..68b0482 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp.v
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlrtp.pp.functional.v"
+`include "sky130_fd_sc_hs__dlrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn.v b/cells/dlxbn/sky130_fd_sc_hs__dlxbn.v
index 51d04d4..7507474 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn.v
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlxbn.pp.functional.v"
+`include "sky130_fd_sc_hs__dlxbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlxbn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlxbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbp/sky130_fd_sc_hs__dlxbp.v b/cells/dlxbp/sky130_fd_sc_hs__dlxbp.v
index 8b16472..e8aafce 100644
--- a/cells/dlxbp/sky130_fd_sc_hs__dlxbp.v
+++ b/cells/dlxbp/sky130_fd_sc_hs__dlxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlxbp.pp.functional.v"
+`include "sky130_fd_sc_hs__dlxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn.v b/cells/dlxtn/sky130_fd_sc_hs__dlxtn.v
index 1c2ca0a..8181984 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn.v
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlxtn.pp.functional.v"
+`include "sky130_fd_sc_hs__dlxtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlxtn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlxtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtp/sky130_fd_sc_hs__dlxtp.v b/cells/dlxtp/sky130_fd_sc_hs__dlxtp.v
index 7d4cb72..90f8b41 100644
--- a/cells/dlxtp/sky130_fd_sc_hs__dlxtp.v
+++ b/cells/dlxtp/sky130_fd_sc_hs__dlxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlxtp.pp.functional.v"
+`include "sky130_fd_sc_hs__dlxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1.v b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1.v
index fa2aba2..132a30c 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlygate4sd1.pp.functional.v"
+`include "sky130_fd_sc_hs__dlygate4sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlygate4sd1.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlygate4sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2.v b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2.v
index 3af2a81..15ada9d 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlygate4sd2.pp.functional.v"
+`include "sky130_fd_sc_hs__dlygate4sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlygate4sd2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlygate4sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3.v b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3.v
index c599d96..990703c 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlygate4sd3.pp.functional.v"
+`include "sky130_fd_sc_hs__dlygate4sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlygate4sd3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlygate4sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s.v b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s.v
index bb82275..8303cac 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlymetal6s2s.pp.functional.v"
+`include "sky130_fd_sc_hs__dlymetal6s2s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlymetal6s2s.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlymetal6s2s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s.v b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s.v
index d146ff2..05c5152 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlymetal6s4s.pp.functional.v"
+`include "sky130_fd_sc_hs__dlymetal6s4s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlymetal6s4s.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlymetal6s4s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s.v b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s.v
index eb25ae6..5863b9e 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__dlymetal6s6s.pp.functional.v"
+`include "sky130_fd_sc_hs__dlymetal6s6s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__dlymetal6s6s.pp.behavioral.v"
+`include "sky130_fd_sc_hs__dlymetal6s6s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn.v b/cells/ebufn/sky130_fd_sc_hs__ebufn.v
index e80bca7..bb68325 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn.v
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__ebufn.pp.functional.v"
+`include "sky130_fd_sc_hs__ebufn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__ebufn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__ebufn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxbp/sky130_fd_sc_hs__edfxbp.v b/cells/edfxbp/sky130_fd_sc_hs__edfxbp.v
index 7ff4f69..d5b44b6 100644
--- a/cells/edfxbp/sky130_fd_sc_hs__edfxbp.v
+++ b/cells/edfxbp/sky130_fd_sc_hs__edfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__edfxbp.pp.functional.v"
+`include "sky130_fd_sc_hs__edfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__edfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__edfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxtp/sky130_fd_sc_hs__edfxtp.v b/cells/edfxtp/sky130_fd_sc_hs__edfxtp.v
index 9a19e68..0a601b4 100644
--- a/cells/edfxtp/sky130_fd_sc_hs__edfxtp.v
+++ b/cells/edfxtp/sky130_fd_sc_hs__edfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__edfxtp.pp.functional.v"
+`include "sky130_fd_sc_hs__edfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__edfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__edfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn.v b/cells/einvn/sky130_fd_sc_hs__einvn.v
index 7752ac9..e6b4c8c 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn.v
+++ b/cells/einvn/sky130_fd_sc_hs__einvn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__einvn.pp.functional.v"
+`include "sky130_fd_sc_hs__einvn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__einvn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__einvn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp.v b/cells/einvp/sky130_fd_sc_hs__einvp.v
index 14d9147..5c312bf 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp.v
+++ b/cells/einvp/sky130_fd_sc_hs__einvp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__einvp.pp.functional.v"
+`include "sky130_fd_sc_hs__einvp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__einvp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__einvp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fa/sky130_fd_sc_hs__fa.v b/cells/fa/sky130_fd_sc_hs__fa.v
index 29e6814..38608fb 100644
--- a/cells/fa/sky130_fd_sc_hs__fa.v
+++ b/cells/fa/sky130_fd_sc_hs__fa.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__fa.pp.functional.v"
+`include "sky130_fd_sc_hs__fa.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__fa.pp.behavioral.v"
+`include "sky130_fd_sc_hs__fa.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fah/sky130_fd_sc_hs__fah.v b/cells/fah/sky130_fd_sc_hs__fah.v
index 94a9107..d2d9b1f 100644
--- a/cells/fah/sky130_fd_sc_hs__fah.v
+++ b/cells/fah/sky130_fd_sc_hs__fah.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__fah.pp.functional.v"
+`include "sky130_fd_sc_hs__fah.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__fah.pp.behavioral.v"
+`include "sky130_fd_sc_hs__fah.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcin/sky130_fd_sc_hs__fahcin.v b/cells/fahcin/sky130_fd_sc_hs__fahcin.v
index a67c2cd..fbae893 100644
--- a/cells/fahcin/sky130_fd_sc_hs__fahcin.v
+++ b/cells/fahcin/sky130_fd_sc_hs__fahcin.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__fahcin.pp.functional.v"
+`include "sky130_fd_sc_hs__fahcin.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__fahcin.pp.behavioral.v"
+`include "sky130_fd_sc_hs__fahcin.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcon/sky130_fd_sc_hs__fahcon.v b/cells/fahcon/sky130_fd_sc_hs__fahcon.v
index d42b94e..e61d34a 100644
--- a/cells/fahcon/sky130_fd_sc_hs__fahcon.v
+++ b/cells/fahcon/sky130_fd_sc_hs__fahcon.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__fahcon.pp.functional.v"
+`include "sky130_fd_sc_hs__fahcon.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__fahcon.pp.behavioral.v"
+`include "sky130_fd_sc_hs__fahcon.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill/sky130_fd_sc_hs__fill.v b/cells/fill/sky130_fd_sc_hs__fill.v
index afadd44..78a3eb9 100644
--- a/cells/fill/sky130_fd_sc_hs__fill.v
+++ b/cells/fill/sky130_fd_sc_hs__fill.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__fill.pp.functional.v"
+`include "sky130_fd_sc_hs__fill.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__fill.pp.behavioral.v"
+`include "sky130_fd_sc_hs__fill.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode.v b/cells/fill_diode/sky130_fd_sc_hs__fill_diode.v
index 34cf1e0..ba2d8b0 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode.v
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__fill_diode.pp.functional.v"
+`include "sky130_fd_sc_hs__fill_diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__fill_diode.pp.behavioral.v"
+`include "sky130_fd_sc_hs__fill_diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ha/sky130_fd_sc_hs__ha.v b/cells/ha/sky130_fd_sc_hs__ha.v
index 8a916fa..c70e247 100644
--- a/cells/ha/sky130_fd_sc_hs__ha.v
+++ b/cells/ha/sky130_fd_sc_hs__ha.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__ha.pp.functional.v"
+`include "sky130_fd_sc_hs__ha.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__ha.pp.behavioral.v"
+`include "sky130_fd_sc_hs__ha.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inv/sky130_fd_sc_hs__inv.v b/cells/inv/sky130_fd_sc_hs__inv.v
index 3142294..6c9e314 100644
--- a/cells/inv/sky130_fd_sc_hs__inv.v
+++ b/cells/inv/sky130_fd_sc_hs__inv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__inv.pp.functional.v"
+`include "sky130_fd_sc_hs__inv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__inv.pp.behavioral.v"
+`include "sky130_fd_sc_hs__inv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3.v b/cells/maj3/sky130_fd_sc_hs__maj3.v
index 90a1493..561e2ec 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3.v
+++ b/cells/maj3/sky130_fd_sc_hs__maj3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__maj3.pp.functional.v"
+`include "sky130_fd_sc_hs__maj3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__maj3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__maj3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2.v b/cells/mux2/sky130_fd_sc_hs__mux2.v
index 31043b4..b3c80a0 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2.v
+++ b/cells/mux2/sky130_fd_sc_hs__mux2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__mux2.pp.functional.v"
+`include "sky130_fd_sc_hs__mux2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__mux2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__mux2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i.v b/cells/mux2i/sky130_fd_sc_hs__mux2i.v
index 937d150..b3f61c6 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i.v
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__mux2i.pp.functional.v"
+`include "sky130_fd_sc_hs__mux2i.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__mux2i.pp.behavioral.v"
+`include "sky130_fd_sc_hs__mux2i.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4.v b/cells/mux4/sky130_fd_sc_hs__mux4.v
index 6e5d575..aba21e0 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4.v
+++ b/cells/mux4/sky130_fd_sc_hs__mux4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__mux4.pp.functional.v"
+`include "sky130_fd_sc_hs__mux4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__mux4.pp.behavioral.v"
+`include "sky130_fd_sc_hs__mux4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2.v b/cells/nand2/sky130_fd_sc_hs__nand2.v
index 6af6e17..801eb5e 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2.v
+++ b/cells/nand2/sky130_fd_sc_hs__nand2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nand2.pp.functional.v"
+`include "sky130_fd_sc_hs__nand2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nand2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nand2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b.v b/cells/nand2b/sky130_fd_sc_hs__nand2b.v
index b4f5815..d0a4ac9 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b.v
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nand2b.pp.functional.v"
+`include "sky130_fd_sc_hs__nand2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nand2b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nand2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3.v b/cells/nand3/sky130_fd_sc_hs__nand3.v
index d19291d..4b3b204 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3.v
+++ b/cells/nand3/sky130_fd_sc_hs__nand3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nand3.pp.functional.v"
+`include "sky130_fd_sc_hs__nand3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nand3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nand3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b.v b/cells/nand3b/sky130_fd_sc_hs__nand3b.v
index 6ee8434..972c3f2 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b.v
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nand3b.pp.functional.v"
+`include "sky130_fd_sc_hs__nand3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nand3b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nand3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4.v b/cells/nand4/sky130_fd_sc_hs__nand4.v
index a962395..e9054dc 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4.v
+++ b/cells/nand4/sky130_fd_sc_hs__nand4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nand4.pp.functional.v"
+`include "sky130_fd_sc_hs__nand4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nand4.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nand4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b.v b/cells/nand4b/sky130_fd_sc_hs__nand4b.v
index 1b580ad..b6af650 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b.v
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nand4b.pp.functional.v"
+`include "sky130_fd_sc_hs__nand4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nand4b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nand4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb.v b/cells/nand4bb/sky130_fd_sc_hs__nand4bb.v
index 8b8d38f..46c3076 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb.v
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nand4bb.pp.functional.v"
+`include "sky130_fd_sc_hs__nand4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nand4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nand4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2.v b/cells/nor2/sky130_fd_sc_hs__nor2.v
index 7b50916..5e23b4d 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2.v
+++ b/cells/nor2/sky130_fd_sc_hs__nor2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nor2.pp.functional.v"
+`include "sky130_fd_sc_hs__nor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nor2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b.v b/cells/nor2b/sky130_fd_sc_hs__nor2b.v
index be214e5..084a6f8 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b.v
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nor2b.pp.functional.v"
+`include "sky130_fd_sc_hs__nor2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nor2b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nor2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3.v b/cells/nor3/sky130_fd_sc_hs__nor3.v
index afac32e..2ff5349 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3.v
+++ b/cells/nor3/sky130_fd_sc_hs__nor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nor3.pp.functional.v"
+`include "sky130_fd_sc_hs__nor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nor3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b.v b/cells/nor3b/sky130_fd_sc_hs__nor3b.v
index a8aae99..673ae25 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b.v
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nor3b.pp.functional.v"
+`include "sky130_fd_sc_hs__nor3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nor3b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nor3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4.v b/cells/nor4/sky130_fd_sc_hs__nor4.v
index 55aae7b..1fd8f62 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4.v
+++ b/cells/nor4/sky130_fd_sc_hs__nor4.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nor4.pp.functional.v"
+`include "sky130_fd_sc_hs__nor4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nor4.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nor4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b.v b/cells/nor4b/sky130_fd_sc_hs__nor4b.v
index 3192b7c..582ca11 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b.v
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nor4b.pp.functional.v"
+`include "sky130_fd_sc_hs__nor4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nor4b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nor4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb.v b/cells/nor4bb/sky130_fd_sc_hs__nor4bb.v
index 1c1145e..57ffc51 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb.v
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__nor4bb.pp.functional.v"
+`include "sky130_fd_sc_hs__nor4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__nor4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hs__nor4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a.v b/cells/o2111a/sky130_fd_sc_hs__o2111a.v
index 2e1990c..f18db01 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a.v
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o2111a.pp.functional.v"
+`include "sky130_fd_sc_hs__o2111a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o2111a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o2111a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai.v b/cells/o2111ai/sky130_fd_sc_hs__o2111ai.v
index c18060d..54c6d9a 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai.v
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o2111ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o2111ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o2111ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o2111ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a.v b/cells/o211a/sky130_fd_sc_hs__o211a.v
index 9379631..81ec344 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a.v
+++ b/cells/o211a/sky130_fd_sc_hs__o211a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o211a.pp.functional.v"
+`include "sky130_fd_sc_hs__o211a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o211a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o211a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai.v b/cells/o211ai/sky130_fd_sc_hs__o211ai.v
index de2d5b5..4496753 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai.v
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o211ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o211ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o211ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o211ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a.v b/cells/o21a/sky130_fd_sc_hs__o21a.v
index a12e38d..60ff5fe 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a.v
+++ b/cells/o21a/sky130_fd_sc_hs__o21a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o21a.pp.functional.v"
+`include "sky130_fd_sc_hs__o21a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o21a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o21a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai.v b/cells/o21ai/sky130_fd_sc_hs__o21ai.v
index 0a50469..e0a3aa2 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai.v
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o21ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o21ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o21ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o21ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba.v b/cells/o21ba/sky130_fd_sc_hs__o21ba.v
index 0d3e758..7b8c7f2 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba.v
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o21ba.pp.functional.v"
+`include "sky130_fd_sc_hs__o21ba.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o21ba.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o21ba.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai.v b/cells/o21bai/sky130_fd_sc_hs__o21bai.v
index b0178da..9497fb1 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai.v
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o21bai.pp.functional.v"
+`include "sky130_fd_sc_hs__o21bai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o21bai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o21bai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a.v b/cells/o221a/sky130_fd_sc_hs__o221a.v
index 64e15f6..02c5dd2 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a.v
+++ b/cells/o221a/sky130_fd_sc_hs__o221a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o221a.pp.functional.v"
+`include "sky130_fd_sc_hs__o221a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o221a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o221a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai.v b/cells/o221ai/sky130_fd_sc_hs__o221ai.v
index 74762e4..56abe6f 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai.v
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o221ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o221ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o221ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o221ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a.v b/cells/o22a/sky130_fd_sc_hs__o22a.v
index 67334c4..3d6d5bb 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a.v
+++ b/cells/o22a/sky130_fd_sc_hs__o22a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o22a.pp.functional.v"
+`include "sky130_fd_sc_hs__o22a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o22a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o22a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai.v b/cells/o22ai/sky130_fd_sc_hs__o22ai.v
index 3b4c60d..b6b7b92 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai.v
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o22ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o22ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o22ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o22ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a.v b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a.v
index 275afe5..3634390 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a.v
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o2bb2a.pp.functional.v"
+`include "sky130_fd_sc_hs__o2bb2a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o2bb2a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o2bb2a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai.v b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai.v
index 5e6042b..4fcd5ac 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o2bb2ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o2bb2ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o2bb2ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o2bb2ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a.v b/cells/o311a/sky130_fd_sc_hs__o311a.v
index 930789c..9794c19 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a.v
+++ b/cells/o311a/sky130_fd_sc_hs__o311a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o311a.pp.functional.v"
+`include "sky130_fd_sc_hs__o311a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o311a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o311a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai.v b/cells/o311ai/sky130_fd_sc_hs__o311ai.v
index e87b5af..33e273e 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai.v
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o311ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o311ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o311ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o311ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a.v b/cells/o31a/sky130_fd_sc_hs__o31a.v
index 4495f16..9e03956 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a.v
+++ b/cells/o31a/sky130_fd_sc_hs__o31a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o31a.pp.functional.v"
+`include "sky130_fd_sc_hs__o31a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o31a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o31a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai.v b/cells/o31ai/sky130_fd_sc_hs__o31ai.v
index 05ea087..15115d3 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai.v
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o31ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o31ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o31ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o31ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a.v b/cells/o32a/sky130_fd_sc_hs__o32a.v
index 19efce0..5efdb15 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a.v
+++ b/cells/o32a/sky130_fd_sc_hs__o32a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o32a.pp.functional.v"
+`include "sky130_fd_sc_hs__o32a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o32a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o32a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai.v b/cells/o32ai/sky130_fd_sc_hs__o32ai.v
index 42c45eb..8027074 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai.v
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o32ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o32ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o32ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o32ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a.v b/cells/o41a/sky130_fd_sc_hs__o41a.v
index 1c5a74d..91baeb6 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a.v
+++ b/cells/o41a/sky130_fd_sc_hs__o41a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o41a.pp.functional.v"
+`include "sky130_fd_sc_hs__o41a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o41a.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o41a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai.v b/cells/o41ai/sky130_fd_sc_hs__o41ai.v
index 48ae07e..0c22f12 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai.v
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__o41ai.pp.functional.v"
+`include "sky130_fd_sc_hs__o41ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__o41ai.pp.behavioral.v"
+`include "sky130_fd_sc_hs__o41ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2/sky130_fd_sc_hs__or2.v b/cells/or2/sky130_fd_sc_hs__or2.v
index 7cc1dcb..7db29ab 100644
--- a/cells/or2/sky130_fd_sc_hs__or2.v
+++ b/cells/or2/sky130_fd_sc_hs__or2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__or2.pp.functional.v"
+`include "sky130_fd_sc_hs__or2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__or2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__or2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b.v b/cells/or2b/sky130_fd_sc_hs__or2b.v
index 03a778f..f70e157 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b.v
+++ b/cells/or2b/sky130_fd_sc_hs__or2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__or2b.pp.functional.v"
+`include "sky130_fd_sc_hs__or2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__or2b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__or2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3/sky130_fd_sc_hs__or3.v b/cells/or3/sky130_fd_sc_hs__or3.v
index 6dcb268..a14aafb 100644
--- a/cells/or3/sky130_fd_sc_hs__or3.v
+++ b/cells/or3/sky130_fd_sc_hs__or3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__or3.pp.functional.v"
+`include "sky130_fd_sc_hs__or3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__or3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__or3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b.v b/cells/or3b/sky130_fd_sc_hs__or3b.v
index 3d61c41..6bfd078 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b.v
+++ b/cells/or3b/sky130_fd_sc_hs__or3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__or3b.pp.functional.v"
+`include "sky130_fd_sc_hs__or3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__or3b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__or3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4/sky130_fd_sc_hs__or4.v b/cells/or4/sky130_fd_sc_hs__or4.v
index 6ef67a2..d55f52e 100644
--- a/cells/or4/sky130_fd_sc_hs__or4.v
+++ b/cells/or4/sky130_fd_sc_hs__or4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__or4.pp.functional.v"
+`include "sky130_fd_sc_hs__or4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__or4.pp.behavioral.v"
+`include "sky130_fd_sc_hs__or4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b.v b/cells/or4b/sky130_fd_sc_hs__or4b.v
index ab345dc..4079c19 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b.v
+++ b/cells/or4b/sky130_fd_sc_hs__or4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__or4b.pp.functional.v"
+`include "sky130_fd_sc_hs__or4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__or4b.pp.behavioral.v"
+`include "sky130_fd_sc_hs__or4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb.v b/cells/or4bb/sky130_fd_sc_hs__or4bb.v
index a099a97..78085c0 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb.v
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__or4bb.pp.functional.v"
+`include "sky130_fd_sc_hs__or4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__or4bb.pp.behavioral.v"
+`include "sky130_fd_sc_hs__or4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn.v b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn.v
index 4128d53..ee59e97 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn.v
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfbbn.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp.v b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp.v
index 9368ea2..af39378 100644
--- a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp.v
+++ b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfbbp.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp.v b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp.v
index 992f9c7..d156155 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp.v
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfrbp.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn.v b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn.v
index bf5e54e..014290e 100644
--- a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn.v
+++ b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfrtn.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp.v b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp.v
index 25afcc6..c52feb7 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp.v
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfrtp.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp.v b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp.v
index 9823c4f..65e082d 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp.v
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfsbp.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp.v b/cells/sdfstp/sky130_fd_sc_hs__sdfstp.v
index 6ab1af3..52eff6a 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp.v
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfstp.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfstp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp.v b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp.v
index 7f23a82..17472a7 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp.v
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfxbp.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp.v b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp.v
index 9b54e8e..30c3987 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp.v
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfxtp.pp.functional.v"
+`include "sky130_fd_sc_hs__sdfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp.v b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp.v
index 5c0d20f..8852dd4 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp.v
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sdlclkp.pp.functional.v"
+`include "sky130_fd_sc_hs__sdlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sdlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sdlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp.v b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp.v
index 4ea420f..ff47a71 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp.v
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sedfxbp.pp.functional.v"
+`include "sky130_fd_sc_hs__sedfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sedfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sedfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp.v b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp.v
index 1b2d834..f73f0bb 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp.v
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__sedfxtp.pp.functional.v"
+`include "sky130_fd_sc_hs__sedfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__sedfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_hs__sedfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tap/sky130_fd_sc_hs__tap.v b/cells/tap/sky130_fd_sc_hs__tap.v
index 0adb983..1f95085 100644
--- a/cells/tap/sky130_fd_sc_hs__tap.v
+++ b/cells/tap/sky130_fd_sc_hs__tap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__tap.pp.functional.v"
+`include "sky130_fd_sc_hs__tap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__tap.pp.behavioral.v"
+`include "sky130_fd_sc_hs__tap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapmet1/sky130_fd_sc_hs__tapmet1.v b/cells/tapmet1/sky130_fd_sc_hs__tapmet1.v
index e988b99..cbd26e9 100644
--- a/cells/tapmet1/sky130_fd_sc_hs__tapmet1.v
+++ b/cells/tapmet1/sky130_fd_sc_hs__tapmet1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__tapmet1.pp.functional.v"
+`include "sky130_fd_sc_hs__tapmet1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__tapmet1.pp.behavioral.v"
+`include "sky130_fd_sc_hs__tapmet1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd.v b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd.v
index aa50a89..14335f3 100644
--- a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd.v
+++ b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__tapvgnd.pp.functional.v"
+`include "sky130_fd_sc_hs__tapvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__tapvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_hs__tapvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2.v b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2.v
index bf5598b..e6dc10f 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2.v
+++ b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__tapvgnd2.pp.functional.v"
+`include "sky130_fd_sc_hs__tapvgnd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__tapvgnd2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__tapvgnd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd.v b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd.v
index 4a4d6d0..10c4c8f 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__tapvpwrvgnd.pp.functional.v"
+`include "sky130_fd_sc_hs__tapvpwrvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__tapvpwrvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_hs__tapvpwrvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2.v b/cells/xnor2/sky130_fd_sc_hs__xnor2.v
index 04e24fe..645a2f1 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2.v
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__xnor2.pp.functional.v"
+`include "sky130_fd_sc_hs__xnor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__xnor2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__xnor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3.v b/cells/xnor3/sky130_fd_sc_hs__xnor3.v
index 79e0696..a6ce96a 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3.v
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__xnor3.pp.functional.v"
+`include "sky130_fd_sc_hs__xnor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__xnor3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__xnor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2.v b/cells/xor2/sky130_fd_sc_hs__xor2.v
index 678e62a..c768092 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2.v
+++ b/cells/xor2/sky130_fd_sc_hs__xor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__xor2.pp.functional.v"
+`include "sky130_fd_sc_hs__xor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__xor2.pp.behavioral.v"
+`include "sky130_fd_sc_hs__xor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3.v b/cells/xor3/sky130_fd_sc_hs__xor3.v
index 99f813f..0cadbc2 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3.v
+++ b/cells/xor3/sky130_fd_sc_hs__xor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_hs__xor3.pp.functional.v"
+`include "sky130_fd_sc_hs__xor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_hs__xor3.pp.behavioral.v"
+`include "sky130_fd_sc_hs__xor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS