diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o.v b/cells/a2111o/sky130_fd_sc_lp__a2111o.v
index d438d5b..4a467e3 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o.v
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a2111o.pp.functional.v"
+`include "sky130_fd_sc_lp__a2111o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a2111o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a2111o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi.v b/cells/a2111oi/sky130_fd_sc_lp__a2111oi.v
index 0c66df7..381d4bb 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi.v
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a2111oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a2111oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a2111oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a2111oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o.v b/cells/a211o/sky130_fd_sc_lp__a211o.v
index 750803f..b6f992a 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o.v
+++ b/cells/a211o/sky130_fd_sc_lp__a211o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a211o.pp.functional.v"
+`include "sky130_fd_sc_lp__a211o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a211o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a211o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi.v b/cells/a211oi/sky130_fd_sc_lp__a211oi.v
index a8b27b6..ec7eeeb 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi.v
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a211oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a211oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a211oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a211oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo.v b/cells/a21bo/sky130_fd_sc_lp__a21bo.v
index a641acb..b7dc50e 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo.v
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a21bo.pp.functional.v"
+`include "sky130_fd_sc_lp__a21bo.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a21bo.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a21bo.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi.v b/cells/a21boi/sky130_fd_sc_lp__a21boi.v
index 14485f3..5bd7f62 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi.v
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a21boi.pp.functional.v"
+`include "sky130_fd_sc_lp__a21boi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a21boi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a21boi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o.v b/cells/a21o/sky130_fd_sc_lp__a21o.v
index 58f5a0f..bc24cc4 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o.v
+++ b/cells/a21o/sky130_fd_sc_lp__a21o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a21o.pp.functional.v"
+`include "sky130_fd_sc_lp__a21o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a21o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a21o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi.v b/cells/a21oi/sky130_fd_sc_lp__a21oi.v
index cdc069a..72ebfe1 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi.v
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a21oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a21oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a21oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a21oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o.v b/cells/a221o/sky130_fd_sc_lp__a221o.v
index 267ac93..9d48e22 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o.v
+++ b/cells/a221o/sky130_fd_sc_lp__a221o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a221o.pp.functional.v"
+`include "sky130_fd_sc_lp__a221o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a221o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a221o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi.v b/cells/a221oi/sky130_fd_sc_lp__a221oi.v
index 1cbd4ea..683678b 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi.v
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a221oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a221oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a221oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a221oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o.v b/cells/a22o/sky130_fd_sc_lp__a22o.v
index 12495e6..8c4ea69 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o.v
+++ b/cells/a22o/sky130_fd_sc_lp__a22o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a22o.pp.functional.v"
+`include "sky130_fd_sc_lp__a22o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a22o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a22o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi.v b/cells/a22oi/sky130_fd_sc_lp__a22oi.v
index d81e218..15edd6d 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi.v
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a22oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a22oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a22oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a22oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o.v b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o.v
index eab3293..173a852 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o.v
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a2bb2o.pp.functional.v"
+`include "sky130_fd_sc_lp__a2bb2o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a2bb2o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a2bb2o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi.v b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi.v
index fbe98e0..bd782d2 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi.v
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a2bb2oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a2bb2oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a2bb2oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a2bb2oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o.v b/cells/a311o/sky130_fd_sc_lp__a311o.v
index 1021aa2..4ca00db 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o.v
+++ b/cells/a311o/sky130_fd_sc_lp__a311o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a311o.pp.functional.v"
+`include "sky130_fd_sc_lp__a311o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a311o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a311o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi.v b/cells/a311oi/sky130_fd_sc_lp__a311oi.v
index 7201f8b..c8e4370 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi.v
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a311oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a311oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a311oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a311oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o.v b/cells/a31o/sky130_fd_sc_lp__a31o.v
index e28aaa4..8b8e707 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o.v
+++ b/cells/a31o/sky130_fd_sc_lp__a31o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a31o.pp.functional.v"
+`include "sky130_fd_sc_lp__a31o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a31o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a31o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi.v b/cells/a31oi/sky130_fd_sc_lp__a31oi.v
index 49291cb..5ae089e 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi.v
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a31oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a31oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a31oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a31oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o.v b/cells/a32o/sky130_fd_sc_lp__a32o.v
index 50527af..61e1b1b 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o.v
+++ b/cells/a32o/sky130_fd_sc_lp__a32o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a32o.pp.functional.v"
+`include "sky130_fd_sc_lp__a32o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a32o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a32o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi.v b/cells/a32oi/sky130_fd_sc_lp__a32oi.v
index 0a5f18e..755c259 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi.v
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a32oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a32oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a32oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a32oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o.v b/cells/a41o/sky130_fd_sc_lp__a41o.v
index cd89ea0..d13a289 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o.v
+++ b/cells/a41o/sky130_fd_sc_lp__a41o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a41o.pp.functional.v"
+`include "sky130_fd_sc_lp__a41o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a41o.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a41o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi.v b/cells/a41oi/sky130_fd_sc_lp__a41oi.v
index 72a1f70..77ea4df 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi.v
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__a41oi.pp.functional.v"
+`include "sky130_fd_sc_lp__a41oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__a41oi.pp.behavioral.v"
+`include "sky130_fd_sc_lp__a41oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2/sky130_fd_sc_lp__and2.v b/cells/and2/sky130_fd_sc_lp__and2.v
index 829974c..8a1864f 100644
--- a/cells/and2/sky130_fd_sc_lp__and2.v
+++ b/cells/and2/sky130_fd_sc_lp__and2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__and2.pp.functional.v"
+`include "sky130_fd_sc_lp__and2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__and2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__and2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b.v b/cells/and2b/sky130_fd_sc_lp__and2b.v
index 6059a11..bea3323 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b.v
+++ b/cells/and2b/sky130_fd_sc_lp__and2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__and2b.pp.functional.v"
+`include "sky130_fd_sc_lp__and2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__and2b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__and2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3/sky130_fd_sc_lp__and3.v b/cells/and3/sky130_fd_sc_lp__and3.v
index cab7d9e..a578229 100644
--- a/cells/and3/sky130_fd_sc_lp__and3.v
+++ b/cells/and3/sky130_fd_sc_lp__and3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__and3.pp.functional.v"
+`include "sky130_fd_sc_lp__and3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__and3.pp.behavioral.v"
+`include "sky130_fd_sc_lp__and3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b.v b/cells/and3b/sky130_fd_sc_lp__and3b.v
index 6b78137..d9784f9 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b.v
+++ b/cells/and3b/sky130_fd_sc_lp__and3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__and3b.pp.functional.v"
+`include "sky130_fd_sc_lp__and3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__and3b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__and3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4/sky130_fd_sc_lp__and4.v b/cells/and4/sky130_fd_sc_lp__and4.v
index b6c0247..d2fef46 100644
--- a/cells/and4/sky130_fd_sc_lp__and4.v
+++ b/cells/and4/sky130_fd_sc_lp__and4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__and4.pp.functional.v"
+`include "sky130_fd_sc_lp__and4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__and4.pp.behavioral.v"
+`include "sky130_fd_sc_lp__and4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b.v b/cells/and4b/sky130_fd_sc_lp__and4b.v
index 317e852..0c2a625 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b.v
+++ b/cells/and4b/sky130_fd_sc_lp__and4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__and4b.pp.functional.v"
+`include "sky130_fd_sc_lp__and4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__and4b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__and4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb.v b/cells/and4bb/sky130_fd_sc_lp__and4bb.v
index cd3f698..bc0819e 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb.v
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__and4bb.pp.functional.v"
+`include "sky130_fd_sc_lp__and4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__and4bb.pp.behavioral.v"
+`include "sky130_fd_sc_lp__and4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/buf/sky130_fd_sc_lp__buf.v b/cells/buf/sky130_fd_sc_lp__buf.v
index b90bed0..81f6060 100644
--- a/cells/buf/sky130_fd_sc_lp__buf.v
+++ b/cells/buf/sky130_fd_sc_lp__buf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__buf.pp.functional.v"
+`include "sky130_fd_sc_lp__buf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__buf.pp.behavioral.v"
+`include "sky130_fd_sc_lp__buf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf.v b/cells/bufbuf/sky130_fd_sc_lp__bufbuf.v
index 4919fd4..fb91773 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf.v
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__bufbuf.pp.functional.v"
+`include "sky130_fd_sc_lp__bufbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__bufbuf.pp.behavioral.v"
+`include "sky130_fd_sc_lp__bufbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv.v b/cells/bufinv/sky130_fd_sc_lp__bufinv.v
index a0f5048..a4e374b 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv.v
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__bufinv.pp.functional.v"
+`include "sky130_fd_sc_lp__bufinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__bufinv.pp.behavioral.v"
+`include "sky130_fd_sc_lp__bufinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr.v b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr.v
index cd2366d..a07a955 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr.v
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__bufkapwr.pp.functional.v"
+`include "sky130_fd_sc_lp__bufkapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__bufkapwr.pp.behavioral.v"
+`include "sky130_fd_sc_lp__bufkapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp.v b/cells/buflp/sky130_fd_sc_lp__buflp.v
index 42ed671..1909ad8 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp.v
+++ b/cells/buflp/sky130_fd_sc_lp__buflp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__buflp.pp.functional.v"
+`include "sky130_fd_sc_lp__buflp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__buflp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__buflp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/busdriver/sky130_fd_sc_lp__busdriver.v b/cells/busdriver/sky130_fd_sc_lp__busdriver.v
index 5d7c0f0..e30c2a3 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver.v
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__busdriver.pp.functional.v"
+`include "sky130_fd_sc_lp__busdriver.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__busdriver.pp.behavioral.v"
+`include "sky130_fd_sc_lp__busdriver.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2.v b/cells/busdriver2/sky130_fd_sc_lp__busdriver2.v
index e1d626a..edc4605 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2.v
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__busdriver2.pp.functional.v"
+`include "sky130_fd_sc_lp__busdriver2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__busdriver2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__busdriver2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp.v b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp.v
index c5df271..338ba58 100644
--- a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp.v
+++ b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__busdrivernovlp.pp.functional.v"
+`include "sky130_fd_sc_lp__busdrivernovlp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__busdrivernovlp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__busdrivernovlp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2.v b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2.v
index 9d73704..2f34af5 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2.v
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__busdrivernovlp2.pp.functional.v"
+`include "sky130_fd_sc_lp__busdrivernovlp2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__busdrivernovlp2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__busdrivernovlp2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep.v b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep.v
index 20acf91..95b344d 100644
--- a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep.v
+++ b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__busdrivernovlpsleep.pp.functional.v"
+`include "sky130_fd_sc_lp__busdrivernovlpsleep.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__busdrivernovlpsleep.pp.behavioral.v"
+`include "sky130_fd_sc_lp__busdrivernovlpsleep.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bushold/sky130_fd_sc_lp__bushold.v b/cells/bushold/sky130_fd_sc_lp__bushold.v
index e48e985..df4af94 100644
--- a/cells/bushold/sky130_fd_sc_lp__bushold.v
+++ b/cells/bushold/sky130_fd_sc_lp__bushold.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__bushold.pp.functional.v"
+`include "sky130_fd_sc_lp__bushold.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__bushold.pp.behavioral.v"
+`include "sky130_fd_sc_lp__bushold.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bushold0/sky130_fd_sc_lp__bushold0.v b/cells/bushold0/sky130_fd_sc_lp__bushold0.v
index 77af257..a8e30d1 100644
--- a/cells/bushold0/sky130_fd_sc_lp__bushold0.v
+++ b/cells/bushold0/sky130_fd_sc_lp__bushold0.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__bushold0.pp.functional.v"
+`include "sky130_fd_sc_lp__bushold0.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__bushold0.pp.behavioral.v"
+`include "sky130_fd_sc_lp__bushold0.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver.v b/cells/busreceiver/sky130_fd_sc_lp__busreceiver.v
index 3f802aa..81cdef0 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver.v
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__busreceiver.pp.functional.v"
+`include "sky130_fd_sc_lp__busreceiver.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__busreceiver.pp.behavioral.v"
+`include "sky130_fd_sc_lp__busreceiver.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf.v b/cells/clkbuf/sky130_fd_sc_lp__clkbuf.v
index 0029813..d91e9b9 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf.v
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__clkbuf.pp.functional.v"
+`include "sky130_fd_sc_lp__clkbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__clkbuf.pp.behavioral.v"
+`include "sky130_fd_sc_lp__clkbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp.v b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp.v
index 4b6d293..e482fce 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp.v
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__clkbuflp.pp.functional.v"
+`include "sky130_fd_sc_lp__clkbuflp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__clkbuflp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__clkbuflp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15.v b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15.v
index 2b16e05..1c84f05 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15.v
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__clkdlybuf4s15.pp.functional.v"
+`include "sky130_fd_sc_lp__clkdlybuf4s15.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__clkdlybuf4s15.pp.behavioral.v"
+`include "sky130_fd_sc_lp__clkdlybuf4s15.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18.v b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18.v
index 0b0648d..7b240a2 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18.v
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__clkdlybuf4s18.pp.functional.v"
+`include "sky130_fd_sc_lp__clkdlybuf4s18.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__clkdlybuf4s18.pp.behavioral.v"
+`include "sky130_fd_sc_lp__clkdlybuf4s18.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25.v b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25.v
index 9d5e859..3833728 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25.v
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__clkdlybuf4s25.pp.functional.v"
+`include "sky130_fd_sc_lp__clkdlybuf4s25.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__clkdlybuf4s25.pp.behavioral.v"
+`include "sky130_fd_sc_lp__clkdlybuf4s25.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50.v b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50.v
index b4f4550..b8d606b 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50.v
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__clkdlybuf4s50.pp.functional.v"
+`include "sky130_fd_sc_lp__clkdlybuf4s50.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__clkdlybuf4s50.pp.behavioral.v"
+`include "sky130_fd_sc_lp__clkdlybuf4s50.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv.v b/cells/clkinv/sky130_fd_sc_lp__clkinv.v
index e818e6e..8148bff 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv.v
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__clkinv.pp.functional.v"
+`include "sky130_fd_sc_lp__clkinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__clkinv.pp.behavioral.v"
+`include "sky130_fd_sc_lp__clkinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp.v b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp.v
index 99427d4..ff5c322 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp.v
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__clkinvlp.pp.functional.v"
+`include "sky130_fd_sc_lp__clkinvlp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__clkinvlp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__clkinvlp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/conb/sky130_fd_sc_lp__conb.v b/cells/conb/sky130_fd_sc_lp__conb.v
index 27a692e..a3a22d7 100644
--- a/cells/conb/sky130_fd_sc_lp__conb.v
+++ b/cells/conb/sky130_fd_sc_lp__conb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__conb.pp.functional.v"
+`include "sky130_fd_sc_lp__conb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__conb.pp.behavioral.v"
+`include "sky130_fd_sc_lp__conb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decap/sky130_fd_sc_lp__decap.v b/cells/decap/sky130_fd_sc_lp__decap.v
index 028f5a6..70fdf0c 100644
--- a/cells/decap/sky130_fd_sc_lp__decap.v
+++ b/cells/decap/sky130_fd_sc_lp__decap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__decap.pp.functional.v"
+`include "sky130_fd_sc_lp__decap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__decap.pp.behavioral.v"
+`include "sky130_fd_sc_lp__decap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr.v b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr.v
index d3b4000..3405608 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr.v
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__decapkapwr.pp.functional.v"
+`include "sky130_fd_sc_lp__decapkapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__decapkapwr.pp.behavioral.v"
+`include "sky130_fd_sc_lp__decapkapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn.v b/cells/dfbbn/sky130_fd_sc_lp__dfbbn.v
index 07f3b71..0ee1be0 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn.v
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfbbn.pp.functional.v"
+`include "sky130_fd_sc_lp__dfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbp/sky130_fd_sc_lp__dfbbp.v b/cells/dfbbp/sky130_fd_sc_lp__dfbbp.v
index 0cbd1d9..0ce1da3 100644
--- a/cells/dfbbp/sky130_fd_sc_lp__dfbbp.v
+++ b/cells/dfbbp/sky130_fd_sc_lp__dfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfbbp.pp.functional.v"
+`include "sky130_fd_sc_lp__dfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp.v b/cells/dfrbp/sky130_fd_sc_lp__dfrbp.v
index 0eedb23..ce8490c 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp.v
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfrbp.pp.functional.v"
+`include "sky130_fd_sc_lp__dfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtn/sky130_fd_sc_lp__dfrtn.v b/cells/dfrtn/sky130_fd_sc_lp__dfrtn.v
index b4d5e93..ca0c386 100644
--- a/cells/dfrtn/sky130_fd_sc_lp__dfrtn.v
+++ b/cells/dfrtn/sky130_fd_sc_lp__dfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfrtn.pp.functional.v"
+`include "sky130_fd_sc_lp__dfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp.v b/cells/dfrtp/sky130_fd_sc_lp__dfrtp.v
index 9cebf28..4177d67 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp.v
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfrtp.pp.functional.v"
+`include "sky130_fd_sc_lp__dfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp.v b/cells/dfsbp/sky130_fd_sc_lp__dfsbp.v
index 84a72f0..fc6ac3e 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp.v
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfsbp.pp.functional.v"
+`include "sky130_fd_sc_lp__dfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp.v b/cells/dfstp/sky130_fd_sc_lp__dfstp.v
index fa36a4e..a788661 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp.v
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfstp.pp.functional.v"
+`include "sky130_fd_sc_lp__dfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfstp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp.v b/cells/dfxbp/sky130_fd_sc_lp__dfxbp.v
index 490c2fc..2a531df 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp.v
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfxbp.pp.functional.v"
+`include "sky130_fd_sc_lp__dfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp.v b/cells/dfxtp/sky130_fd_sc_lp__dfxtp.v
index 22c3656..e9f124a 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp.v
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dfxtp.pp.functional.v"
+`include "sky130_fd_sc_lp__dfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/diode/sky130_fd_sc_lp__diode.v b/cells/diode/sky130_fd_sc_lp__diode.v
index da73e02..f3674c9 100644
--- a/cells/diode/sky130_fd_sc_lp__diode.v
+++ b/cells/diode/sky130_fd_sc_lp__diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__diode.pp.functional.v"
+`include "sky130_fd_sc_lp__diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__diode.pp.behavioral.v"
+`include "sky130_fd_sc_lp__diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp.v b/cells/dlclkp/sky130_fd_sc_lp__dlclkp.v
index 6aa1c4b..6a89132 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp.v
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlclkp.pp.functional.v"
+`include "sky130_fd_sc_lp__dlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn.v b/cells/dlrbn/sky130_fd_sc_lp__dlrbn.v
index e7d3a68..094c67e 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn.v
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlrbn.pp.functional.v"
+`include "sky130_fd_sc_lp__dlrbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlrbn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlrbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp.v b/cells/dlrbp/sky130_fd_sc_lp__dlrbp.v
index a134b5e..1530cd2 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp.v
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlrbp.pp.functional.v"
+`include "sky130_fd_sc_lp__dlrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlrbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn.v b/cells/dlrtn/sky130_fd_sc_lp__dlrtn.v
index f1e04eb..3894937 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn.v
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlrtn.pp.functional.v"
+`include "sky130_fd_sc_lp__dlrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlrtn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp.v b/cells/dlrtp/sky130_fd_sc_lp__dlrtp.v
index 951d396..3aeca3c 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp.v
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlrtp.pp.functional.v"
+`include "sky130_fd_sc_lp__dlrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlrtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn.v b/cells/dlxbn/sky130_fd_sc_lp__dlxbn.v
index 28f81d2..08a9678 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn.v
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlxbn.pp.functional.v"
+`include "sky130_fd_sc_lp__dlxbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlxbn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlxbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp.v b/cells/dlxbp/sky130_fd_sc_lp__dlxbp.v
index 4eecfcd..2e0a70f 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp.v
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlxbp.pp.functional.v"
+`include "sky130_fd_sc_lp__dlxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlxbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn.v b/cells/dlxtn/sky130_fd_sc_lp__dlxtn.v
index 54d7f80..3575804 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn.v
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlxtn.pp.functional.v"
+`include "sky130_fd_sc_lp__dlxtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlxtn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlxtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp.v b/cells/dlxtp/sky130_fd_sc_lp__dlxtp.v
index 3616910..09c430d 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp.v
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlxtp.pp.functional.v"
+`include "sky130_fd_sc_lp__dlxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlxtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr.v b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr.v
index 29067d3..49526e9 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr.v
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlybuf4s15kapwr.pp.functional.v"
+`include "sky130_fd_sc_lp__dlybuf4s15kapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlybuf4s15kapwr.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlybuf4s15kapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr.v b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr.v
index 0275f63..daf13a1 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr.v
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlybuf4s18kapwr.pp.functional.v"
+`include "sky130_fd_sc_lp__dlybuf4s18kapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlybuf4s18kapwr.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlybuf4s18kapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr.v b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr.v
index 586e689..f60efe3 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr.v
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlybuf4s25kapwr.pp.functional.v"
+`include "sky130_fd_sc_lp__dlybuf4s25kapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlybuf4s25kapwr.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlybuf4s25kapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr.v b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr.v
index 59b6aed..1f37bb2 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr.v
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlybuf4s50kapwr.pp.functional.v"
+`include "sky130_fd_sc_lp__dlybuf4s50kapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlybuf4s50kapwr.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlybuf4s50kapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15.v b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15.v
index 3decc85..3f7a421 100644
--- a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15.v
+++ b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlygate4s15.pp.functional.v"
+`include "sky130_fd_sc_lp__dlygate4s15.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlygate4s15.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlygate4s15.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18.v b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18.v
index 95f70e9..dfab662 100644
--- a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18.v
+++ b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlygate4s18.pp.functional.v"
+`include "sky130_fd_sc_lp__dlygate4s18.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlygate4s18.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlygate4s18.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50.v b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50.v
index 6c62346..bebddce 100644
--- a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50.v
+++ b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlygate4s50.pp.functional.v"
+`include "sky130_fd_sc_lp__dlygate4s50.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlygate4s50.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlygate4s50.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s.v b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s.v
index d11aec5..3c69455 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlymetal6s2s.pp.functional.v"
+`include "sky130_fd_sc_lp__dlymetal6s2s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlymetal6s2s.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlymetal6s2s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s.v b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s.v
index 46e1658..cbf8143 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlymetal6s4s.pp.functional.v"
+`include "sky130_fd_sc_lp__dlymetal6s4s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlymetal6s4s.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlymetal6s4s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s.v b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s.v
index f126b9b..7ceb40a 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__dlymetal6s6s.pp.functional.v"
+`include "sky130_fd_sc_lp__dlymetal6s6s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__dlymetal6s6s.pp.behavioral.v"
+`include "sky130_fd_sc_lp__dlymetal6s6s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn.v b/cells/ebufn/sky130_fd_sc_lp__ebufn.v
index 08f4b82..bedcec1 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn.v
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__ebufn.pp.functional.v"
+`include "sky130_fd_sc_lp__ebufn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__ebufn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__ebufn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxbp/sky130_fd_sc_lp__edfxbp.v b/cells/edfxbp/sky130_fd_sc_lp__edfxbp.v
index a7edb2d..9e7fbd6 100644
--- a/cells/edfxbp/sky130_fd_sc_lp__edfxbp.v
+++ b/cells/edfxbp/sky130_fd_sc_lp__edfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__edfxbp.pp.functional.v"
+`include "sky130_fd_sc_lp__edfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__edfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__edfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn.v b/cells/einvn/sky130_fd_sc_lp__einvn.v
index 5c1a759..d86fa0c 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn.v
+++ b/cells/einvn/sky130_fd_sc_lp__einvn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__einvn.pp.functional.v"
+`include "sky130_fd_sc_lp__einvn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__einvn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__einvn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp.v b/cells/einvp/sky130_fd_sc_lp__einvp.v
index 35bc68e..109b671 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp.v
+++ b/cells/einvp/sky130_fd_sc_lp__einvp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__einvp.pp.functional.v"
+`include "sky130_fd_sc_lp__einvp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__einvp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__einvp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fa/sky130_fd_sc_lp__fa.v b/cells/fa/sky130_fd_sc_lp__fa.v
index 2c22ea6..5338829 100644
--- a/cells/fa/sky130_fd_sc_lp__fa.v
+++ b/cells/fa/sky130_fd_sc_lp__fa.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__fa.pp.functional.v"
+`include "sky130_fd_sc_lp__fa.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__fa.pp.behavioral.v"
+`include "sky130_fd_sc_lp__fa.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fah/sky130_fd_sc_lp__fah.v b/cells/fah/sky130_fd_sc_lp__fah.v
index 37aaa15..a1b18c4 100644
--- a/cells/fah/sky130_fd_sc_lp__fah.v
+++ b/cells/fah/sky130_fd_sc_lp__fah.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__fah.pp.functional.v"
+`include "sky130_fd_sc_lp__fah.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__fah.pp.behavioral.v"
+`include "sky130_fd_sc_lp__fah.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcin/sky130_fd_sc_lp__fahcin.v b/cells/fahcin/sky130_fd_sc_lp__fahcin.v
index 97ea9bf..ca407a4 100644
--- a/cells/fahcin/sky130_fd_sc_lp__fahcin.v
+++ b/cells/fahcin/sky130_fd_sc_lp__fahcin.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__fahcin.pp.functional.v"
+`include "sky130_fd_sc_lp__fahcin.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__fahcin.pp.behavioral.v"
+`include "sky130_fd_sc_lp__fahcin.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcon/sky130_fd_sc_lp__fahcon.v b/cells/fahcon/sky130_fd_sc_lp__fahcon.v
index 14bdf08..3bba500 100644
--- a/cells/fahcon/sky130_fd_sc_lp__fahcon.v
+++ b/cells/fahcon/sky130_fd_sc_lp__fahcon.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__fahcon.pp.functional.v"
+`include "sky130_fd_sc_lp__fahcon.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__fahcon.pp.behavioral.v"
+`include "sky130_fd_sc_lp__fahcon.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill/sky130_fd_sc_lp__fill.v b/cells/fill/sky130_fd_sc_lp__fill.v
index 35cb7f0..f8b9d15 100644
--- a/cells/fill/sky130_fd_sc_lp__fill.v
+++ b/cells/fill/sky130_fd_sc_lp__fill.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__fill.pp.functional.v"
+`include "sky130_fd_sc_lp__fill.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__fill.pp.behavioral.v"
+`include "sky130_fd_sc_lp__fill.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ha/sky130_fd_sc_lp__ha.v b/cells/ha/sky130_fd_sc_lp__ha.v
index 0b8c6d8..9164268 100644
--- a/cells/ha/sky130_fd_sc_lp__ha.v
+++ b/cells/ha/sky130_fd_sc_lp__ha.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__ha.pp.functional.v"
+`include "sky130_fd_sc_lp__ha.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__ha.pp.behavioral.v"
+`include "sky130_fd_sc_lp__ha.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n.v b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n.v
index c95b8d2..83e9c8f 100644
--- a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n.v
+++ b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__inputiso0n.pp.functional.v"
+`include "sky130_fd_sc_lp__inputiso0n.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__inputiso0n.pp.behavioral.v"
+`include "sky130_fd_sc_lp__inputiso0n.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p.v b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p.v
index 81d3aad..5e9c66d 100644
--- a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p.v
+++ b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__inputiso0p.pp.functional.v"
+`include "sky130_fd_sc_lp__inputiso0p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__inputiso0p.pp.behavioral.v"
+`include "sky130_fd_sc_lp__inputiso0p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n.v b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n.v
index f0043ea..8448e6b 100644
--- a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n.v
+++ b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__inputiso1n.pp.functional.v"
+`include "sky130_fd_sc_lp__inputiso1n.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__inputiso1n.pp.behavioral.v"
+`include "sky130_fd_sc_lp__inputiso1n.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p.v b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p.v
index ffe2004..6446aa0 100644
--- a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p.v
+++ b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__inputiso1p.pp.functional.v"
+`include "sky130_fd_sc_lp__inputiso1p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__inputiso1p.pp.behavioral.v"
+`include "sky130_fd_sc_lp__inputiso1p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch.v b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch.v
index 1776210..5a6ca2f 100644
--- a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch.v
+++ b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__inputisolatch.pp.functional.v"
+`include "sky130_fd_sc_lp__inputisolatch.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__inputisolatch.pp.behavioral.v"
+`include "sky130_fd_sc_lp__inputisolatch.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inv/sky130_fd_sc_lp__inv.v b/cells/inv/sky130_fd_sc_lp__inv.v
index 5de7377..8228eaa 100644
--- a/cells/inv/sky130_fd_sc_lp__inv.v
+++ b/cells/inv/sky130_fd_sc_lp__inv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__inv.pp.functional.v"
+`include "sky130_fd_sc_lp__inv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__inv.pp.behavioral.v"
+`include "sky130_fd_sc_lp__inv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr.v b/cells/invkapwr/sky130_fd_sc_lp__invkapwr.v
index a0d2156..b7418aa 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr.v
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__invkapwr.pp.functional.v"
+`include "sky130_fd_sc_lp__invkapwr.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__invkapwr.pp.behavioral.v"
+`include "sky130_fd_sc_lp__invkapwr.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp.v b/cells/invlp/sky130_fd_sc_lp__invlp.v
index ef20239..43e7091 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp.v
+++ b/cells/invlp/sky130_fd_sc_lp__invlp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__invlp.pp.functional.v"
+`include "sky130_fd_sc_lp__invlp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__invlp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__invlp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n.v b/cells/iso0n/sky130_fd_sc_lp__iso0n.v
index 81e356f..0298a25 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n.v
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__iso0n.pp.functional.v"
+`include "sky130_fd_sc_lp__iso0n.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__iso0n.pp.behavioral.v"
+`include "sky130_fd_sc_lp__iso0n.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p.v b/cells/iso0p/sky130_fd_sc_lp__iso0p.v
index 7c1caf9..f68857d 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p.v
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__iso0p.pp.functional.v"
+`include "sky130_fd_sc_lp__iso0p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__iso0p.pp.behavioral.v"
+`include "sky130_fd_sc_lp__iso0p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n.v b/cells/iso1n/sky130_fd_sc_lp__iso1n.v
index fae34bb..96e8d9e 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n.v
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__iso1n.pp.functional.v"
+`include "sky130_fd_sc_lp__iso1n.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__iso1n.pp.behavioral.v"
+`include "sky130_fd_sc_lp__iso1n.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p.v b/cells/iso1p/sky130_fd_sc_lp__iso1p.v
index a940c0d..55b4359 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p.v
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__iso1p.pp.functional.v"
+`include "sky130_fd_sc_lp__iso1p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__iso1p.pp.behavioral.v"
+`include "sky130_fd_sc_lp__iso1p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc.v b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc.v
index b831616..19cb058 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc.v
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__isobufsrc.pp.functional.v"
+`include "sky130_fd_sc_lp__isobufsrc.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__isobufsrc.pp.behavioral.v"
+`include "sky130_fd_sc_lp__isobufsrc.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/isolatch/sky130_fd_sc_lp__isolatch.v b/cells/isolatch/sky130_fd_sc_lp__isolatch.v
index 45b2600..3cd3693 100644
--- a/cells/isolatch/sky130_fd_sc_lp__isolatch.v
+++ b/cells/isolatch/sky130_fd_sc_lp__isolatch.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__isolatch.pp.functional.v"
+`include "sky130_fd_sc_lp__isolatch.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__isolatch.pp.behavioral.v"
+`include "sky130_fd_sc_lp__isolatch.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbuf/sky130_fd_sc_lp__lsbuf.v b/cells/lsbuf/sky130_fd_sc_lp__lsbuf.v
index a8d13f1..9dc4de8 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf.v
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__lsbuf.pp.functional.v"
+`include "sky130_fd_sc_lp__lsbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__lsbuf.pp.behavioral.v"
+`include "sky130_fd_sc_lp__lsbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p.v b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p.v
index 701f7b6..13a7e75 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p.v
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__lsbufiso0p.pp.functional.v"
+`include "sky130_fd_sc_lp__lsbufiso0p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__lsbufiso0p.pp.behavioral.v"
+`include "sky130_fd_sc_lp__lsbufiso0p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p.v b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p.v
index 5f5c96f..021acb3 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p.v
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__lsbufiso1p.pp.functional.v"
+`include "sky130_fd_sc_lp__lsbufiso1p.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__lsbufiso1p.pp.behavioral.v"
+`include "sky130_fd_sc_lp__lsbufiso1p.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3.v b/cells/maj3/sky130_fd_sc_lp__maj3.v
index aaebdc3..46a9a73 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3.v
+++ b/cells/maj3/sky130_fd_sc_lp__maj3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__maj3.pp.functional.v"
+`include "sky130_fd_sc_lp__maj3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__maj3.pp.behavioral.v"
+`include "sky130_fd_sc_lp__maj3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2.v b/cells/mux2/sky130_fd_sc_lp__mux2.v
index 8766d3b..2d16c1c 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2.v
+++ b/cells/mux2/sky130_fd_sc_lp__mux2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__mux2.pp.functional.v"
+`include "sky130_fd_sc_lp__mux2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__mux2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__mux2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i.v b/cells/mux2i/sky130_fd_sc_lp__mux2i.v
index 7836ab1..926d1b7 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i.v
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__mux2i.pp.functional.v"
+`include "sky130_fd_sc_lp__mux2i.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__mux2i.pp.behavioral.v"
+`include "sky130_fd_sc_lp__mux2i.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4.v b/cells/mux4/sky130_fd_sc_lp__mux4.v
index 60e20d8..b62f801 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4.v
+++ b/cells/mux4/sky130_fd_sc_lp__mux4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__mux4.pp.functional.v"
+`include "sky130_fd_sc_lp__mux4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__mux4.pp.behavioral.v"
+`include "sky130_fd_sc_lp__mux4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2.v b/cells/nand2/sky130_fd_sc_lp__nand2.v
index 0776c8c..b50a581 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2.v
+++ b/cells/nand2/sky130_fd_sc_lp__nand2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nand2.pp.functional.v"
+`include "sky130_fd_sc_lp__nand2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nand2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nand2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b.v b/cells/nand2b/sky130_fd_sc_lp__nand2b.v
index 031eec4..ded09e8 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b.v
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nand2b.pp.functional.v"
+`include "sky130_fd_sc_lp__nand2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nand2b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nand2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3.v b/cells/nand3/sky130_fd_sc_lp__nand3.v
index c23ae1b..3391af8 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3.v
+++ b/cells/nand3/sky130_fd_sc_lp__nand3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nand3.pp.functional.v"
+`include "sky130_fd_sc_lp__nand3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nand3.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nand3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b.v b/cells/nand3b/sky130_fd_sc_lp__nand3b.v
index 989cd91..e68aee1 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b.v
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nand3b.pp.functional.v"
+`include "sky130_fd_sc_lp__nand3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nand3b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nand3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4.v b/cells/nand4/sky130_fd_sc_lp__nand4.v
index e9f1a05..cdf73db 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4.v
+++ b/cells/nand4/sky130_fd_sc_lp__nand4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nand4.pp.functional.v"
+`include "sky130_fd_sc_lp__nand4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nand4.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nand4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b.v b/cells/nand4b/sky130_fd_sc_lp__nand4b.v
index 1aa8b4b..542d06b 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b.v
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nand4b.pp.functional.v"
+`include "sky130_fd_sc_lp__nand4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nand4b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nand4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb.v b/cells/nand4bb/sky130_fd_sc_lp__nand4bb.v
index 879f295..7f20828 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb.v
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nand4bb.pp.functional.v"
+`include "sky130_fd_sc_lp__nand4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nand4bb.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nand4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2.v b/cells/nor2/sky130_fd_sc_lp__nor2.v
index 6756010..1ae9274 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2.v
+++ b/cells/nor2/sky130_fd_sc_lp__nor2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nor2.pp.functional.v"
+`include "sky130_fd_sc_lp__nor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nor2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b.v b/cells/nor2b/sky130_fd_sc_lp__nor2b.v
index 160e2cf..09c13b5 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b.v
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nor2b.pp.functional.v"
+`include "sky130_fd_sc_lp__nor2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nor2b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nor2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3.v b/cells/nor3/sky130_fd_sc_lp__nor3.v
index 89b1cb6..ffc4718 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3.v
+++ b/cells/nor3/sky130_fd_sc_lp__nor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nor3.pp.functional.v"
+`include "sky130_fd_sc_lp__nor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nor3.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b.v b/cells/nor3b/sky130_fd_sc_lp__nor3b.v
index 49872ca..1ac1a5b 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b.v
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nor3b.pp.functional.v"
+`include "sky130_fd_sc_lp__nor3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nor3b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nor3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4.v b/cells/nor4/sky130_fd_sc_lp__nor4.v
index 56c2841..cacd152 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4.v
+++ b/cells/nor4/sky130_fd_sc_lp__nor4.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nor4.pp.functional.v"
+`include "sky130_fd_sc_lp__nor4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nor4.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nor4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b.v b/cells/nor4b/sky130_fd_sc_lp__nor4b.v
index d3482e6..a9c1553 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b.v
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nor4b.pp.functional.v"
+`include "sky130_fd_sc_lp__nor4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nor4b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nor4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb.v b/cells/nor4bb/sky130_fd_sc_lp__nor4bb.v
index fce997a..da177fa 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb.v
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__nor4bb.pp.functional.v"
+`include "sky130_fd_sc_lp__nor4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__nor4bb.pp.behavioral.v"
+`include "sky130_fd_sc_lp__nor4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a.v b/cells/o2111a/sky130_fd_sc_lp__o2111a.v
index 61fb4af..b733535 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a.v
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o2111a.pp.functional.v"
+`include "sky130_fd_sc_lp__o2111a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o2111a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o2111a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai.v b/cells/o2111ai/sky130_fd_sc_lp__o2111ai.v
index 1303449..2876caa 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai.v
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o2111ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o2111ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o2111ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o2111ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a.v b/cells/o211a/sky130_fd_sc_lp__o211a.v
index 8625239..60b1f6c 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a.v
+++ b/cells/o211a/sky130_fd_sc_lp__o211a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o211a.pp.functional.v"
+`include "sky130_fd_sc_lp__o211a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o211a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o211a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai.v b/cells/o211ai/sky130_fd_sc_lp__o211ai.v
index 96d887a..94b7e0a 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai.v
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o211ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o211ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o211ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o211ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a.v b/cells/o21a/sky130_fd_sc_lp__o21a.v
index cc57f0b..84d80dc 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a.v
+++ b/cells/o21a/sky130_fd_sc_lp__o21a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o21a.pp.functional.v"
+`include "sky130_fd_sc_lp__o21a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o21a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o21a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai.v b/cells/o21ai/sky130_fd_sc_lp__o21ai.v
index 418637e..04d0490 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai.v
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o21ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o21ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o21ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o21ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba.v b/cells/o21ba/sky130_fd_sc_lp__o21ba.v
index 5ce9ed5..c0c3305 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba.v
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o21ba.pp.functional.v"
+`include "sky130_fd_sc_lp__o21ba.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o21ba.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o21ba.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai.v b/cells/o21bai/sky130_fd_sc_lp__o21bai.v
index 05f3cd0..327ff26 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai.v
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o21bai.pp.functional.v"
+`include "sky130_fd_sc_lp__o21bai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o21bai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o21bai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a.v b/cells/o221a/sky130_fd_sc_lp__o221a.v
index 50ac9d5..d626bc1 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a.v
+++ b/cells/o221a/sky130_fd_sc_lp__o221a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o221a.pp.functional.v"
+`include "sky130_fd_sc_lp__o221a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o221a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o221a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai.v b/cells/o221ai/sky130_fd_sc_lp__o221ai.v
index ae45612..7b3c03d 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai.v
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o221ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o221ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o221ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o221ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a.v b/cells/o22a/sky130_fd_sc_lp__o22a.v
index fecb2f4..4fc730d 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a.v
+++ b/cells/o22a/sky130_fd_sc_lp__o22a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o22a.pp.functional.v"
+`include "sky130_fd_sc_lp__o22a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o22a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o22a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai.v b/cells/o22ai/sky130_fd_sc_lp__o22ai.v
index 02fa143..506a228 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai.v
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o22ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o22ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o22ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o22ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a.v b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a.v
index 6168abe..5e80387 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a.v
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o2bb2a.pp.functional.v"
+`include "sky130_fd_sc_lp__o2bb2a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o2bb2a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o2bb2a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai.v b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai.v
index 0997e2c..6f90be8 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai.v
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o2bb2ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o2bb2ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o2bb2ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o2bb2ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a.v b/cells/o311a/sky130_fd_sc_lp__o311a.v
index 5ff4f8e..0bd25f0 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a.v
+++ b/cells/o311a/sky130_fd_sc_lp__o311a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o311a.pp.functional.v"
+`include "sky130_fd_sc_lp__o311a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o311a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o311a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai.v b/cells/o311ai/sky130_fd_sc_lp__o311ai.v
index a85fb05..4e6a545 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai.v
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o311ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o311ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o311ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o311ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a.v b/cells/o31a/sky130_fd_sc_lp__o31a.v
index 4a72b95..a234a37 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a.v
+++ b/cells/o31a/sky130_fd_sc_lp__o31a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o31a.pp.functional.v"
+`include "sky130_fd_sc_lp__o31a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o31a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o31a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai.v b/cells/o31ai/sky130_fd_sc_lp__o31ai.v
index 475c235..f18e84e 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai.v
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o31ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o31ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o31ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o31ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a.v b/cells/o32a/sky130_fd_sc_lp__o32a.v
index b9f19c5..b39763d 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a.v
+++ b/cells/o32a/sky130_fd_sc_lp__o32a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o32a.pp.functional.v"
+`include "sky130_fd_sc_lp__o32a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o32a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o32a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai.v b/cells/o32ai/sky130_fd_sc_lp__o32ai.v
index cb0262a..58f0e12 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai.v
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o32ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o32ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o32ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o32ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a.v b/cells/o41a/sky130_fd_sc_lp__o41a.v
index 8ba41a7..37b1d38 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a.v
+++ b/cells/o41a/sky130_fd_sc_lp__o41a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o41a.pp.functional.v"
+`include "sky130_fd_sc_lp__o41a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o41a.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o41a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai.v b/cells/o41ai/sky130_fd_sc_lp__o41ai.v
index 4f1e1e4..84c6c1a 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai.v
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__o41ai.pp.functional.v"
+`include "sky130_fd_sc_lp__o41ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__o41ai.pp.behavioral.v"
+`include "sky130_fd_sc_lp__o41ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2/sky130_fd_sc_lp__or2.v b/cells/or2/sky130_fd_sc_lp__or2.v
index e1c649e..36ff4f1 100644
--- a/cells/or2/sky130_fd_sc_lp__or2.v
+++ b/cells/or2/sky130_fd_sc_lp__or2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__or2.pp.functional.v"
+`include "sky130_fd_sc_lp__or2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__or2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__or2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b.v b/cells/or2b/sky130_fd_sc_lp__or2b.v
index 64e8486..47b715d 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b.v
+++ b/cells/or2b/sky130_fd_sc_lp__or2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__or2b.pp.functional.v"
+`include "sky130_fd_sc_lp__or2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__or2b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__or2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3/sky130_fd_sc_lp__or3.v b/cells/or3/sky130_fd_sc_lp__or3.v
index 3424d6d..b15ec2a 100644
--- a/cells/or3/sky130_fd_sc_lp__or3.v
+++ b/cells/or3/sky130_fd_sc_lp__or3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__or3.pp.functional.v"
+`include "sky130_fd_sc_lp__or3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__or3.pp.behavioral.v"
+`include "sky130_fd_sc_lp__or3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b.v b/cells/or3b/sky130_fd_sc_lp__or3b.v
index 9b5d45c..7781f86 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b.v
+++ b/cells/or3b/sky130_fd_sc_lp__or3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__or3b.pp.functional.v"
+`include "sky130_fd_sc_lp__or3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__or3b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__or3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4/sky130_fd_sc_lp__or4.v b/cells/or4/sky130_fd_sc_lp__or4.v
index c682a75..06370d4 100644
--- a/cells/or4/sky130_fd_sc_lp__or4.v
+++ b/cells/or4/sky130_fd_sc_lp__or4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__or4.pp.functional.v"
+`include "sky130_fd_sc_lp__or4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__or4.pp.behavioral.v"
+`include "sky130_fd_sc_lp__or4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b.v b/cells/or4b/sky130_fd_sc_lp__or4b.v
index c5a57e1..29eecea 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b.v
+++ b/cells/or4b/sky130_fd_sc_lp__or4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__or4b.pp.functional.v"
+`include "sky130_fd_sc_lp__or4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__or4b.pp.behavioral.v"
+`include "sky130_fd_sc_lp__or4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb.v b/cells/or4bb/sky130_fd_sc_lp__or4bb.v
index 7b0b91e..5d93a4b 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb.v
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__or4bb.pp.functional.v"
+`include "sky130_fd_sc_lp__or4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__or4bb.pp.behavioral.v"
+`include "sky130_fd_sc_lp__or4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn.v b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn.v
index ab304ae..243dbf0 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn.v
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfbbn.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp.v b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp.v
index eecc246..083fdbc 100644
--- a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp.v
+++ b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfbbp.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp.v b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp.v
index e8deaa9..e132776 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp.v
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfrbp.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn.v b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn.v
index e5db7fc..49f0663 100644
--- a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn.v
+++ b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfrtn.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp.v b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp.v
index 5c9c20a..0c89d0d 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp.v
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfrtp.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.v b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.v
index 0530adc..41a6b0f 100644
--- a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.v
+++ b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfrtp_ov2.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfrtp_ov2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfrtp_ov2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfrtp_ov2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp.v b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp.v
index 14aa398..ca48279 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp.v
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfsbp.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp.v b/cells/sdfstp/sky130_fd_sc_lp__sdfstp.v
index 93b85c5..6118295 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp.v
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfstp.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfstp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp.v b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp.v
index 516adec..7ee0d56 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp.v
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfxbp.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp.v b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp.v
index fd8a8d6..8cd53a8 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp.v
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfxtp.pp.functional.v"
+`include "sky130_fd_sc_lp__sdfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp.v b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp.v
index 7aa2153..283d219 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp.v
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sdlclkp.pp.functional.v"
+`include "sky130_fd_sc_lp__sdlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sdlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sdlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv.v b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv.v
index 6374857..b1fd035 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv.v
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sleep_pargate_plv.pp.functional.v"
+`include "sky130_fd_sc_lp__sleep_pargate_plv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sleep_pargate_plv.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sleep_pargate_plv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv.v b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv.v
index 7d21032..9d8a126 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv.v
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sleep_sergate_plv.pp.functional.v"
+`include "sky130_fd_sc_lp__sleep_sergate_plv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sleep_sergate_plv.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sleep_sergate_plv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp.v b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp.v
index d9fb3e3..655f62b 100644
--- a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp.v
+++ b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__srdlrtp.pp.functional.v"
+`include "sky130_fd_sc_lp__srdlrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__srdlrtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__srdlrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/srdlstp/sky130_fd_sc_lp__srdlstp.v b/cells/srdlstp/sky130_fd_sc_lp__srdlstp.v
index 5c51903..759b916 100644
--- a/cells/srdlstp/sky130_fd_sc_lp__srdlstp.v
+++ b/cells/srdlstp/sky130_fd_sc_lp__srdlstp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__srdlstp.pp.functional.v"
+`include "sky130_fd_sc_lp__srdlstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__srdlstp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__srdlstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp.v b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp.v
index 295343f..4e4a1e5 100644
--- a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp.v
+++ b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__srdlxtp.pp.functional.v"
+`include "sky130_fd_sc_lp__srdlxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__srdlxtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__srdlxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sregrbp/sky130_fd_sc_lp__sregrbp.v b/cells/sregrbp/sky130_fd_sc_lp__sregrbp.v
index c113b30..7e1515c 100644
--- a/cells/sregrbp/sky130_fd_sc_lp__sregrbp.v
+++ b/cells/sregrbp/sky130_fd_sc_lp__sregrbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sregrbp.pp.functional.v"
+`include "sky130_fd_sc_lp__sregrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sregrbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sregrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sregsbp/sky130_fd_sc_lp__sregsbp.v b/cells/sregsbp/sky130_fd_sc_lp__sregsbp.v
index 82a9c54..39f3aaf 100644
--- a/cells/sregsbp/sky130_fd_sc_lp__sregsbp.v
+++ b/cells/sregsbp/sky130_fd_sc_lp__sregsbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__sregsbp.pp.functional.v"
+`include "sky130_fd_sc_lp__sregsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__sregsbp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__sregsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn.v b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn.v
index 419afb7..d813e97 100644
--- a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn.v
+++ b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__srsdfrtn.pp.functional.v"
+`include "sky130_fd_sc_lp__srsdfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__srsdfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_lp__srsdfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp.v b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp.v
index 02b4fa5..1ad9f04 100644
--- a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp.v
+++ b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__srsdfrtp.pp.functional.v"
+`include "sky130_fd_sc_lp__srsdfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__srsdfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__srsdfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp.v b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp.v
index e07c2c6..cf059f3 100644
--- a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp.v
+++ b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__srsdfstp.pp.functional.v"
+`include "sky130_fd_sc_lp__srsdfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__srsdfstp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__srsdfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp.v b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp.v
index e8a2d9c..9a7636e 100644
--- a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp.v
+++ b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__srsdfxtp.pp.functional.v"
+`include "sky130_fd_sc_lp__srsdfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__srsdfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_lp__srsdfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tap/sky130_fd_sc_lp__tap.v b/cells/tap/sky130_fd_sc_lp__tap.v
index 3dd1e25..e3b0f8a 100644
--- a/cells/tap/sky130_fd_sc_lp__tap.v
+++ b/cells/tap/sky130_fd_sc_lp__tap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__tap.pp.functional.v"
+`include "sky130_fd_sc_lp__tap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__tap.pp.behavioral.v"
+`include "sky130_fd_sc_lp__tap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd.v b/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd.v
index 832d59e..a8e31f3 100644
--- a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd.v
+++ b/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__tapvgnd.pp.functional.v"
+`include "sky130_fd_sc_lp__tapvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__tapvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_lp__tapvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2.v b/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2.v
index adf7991..04ff900 100644
--- a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2.v
+++ b/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__tapvgnd2.pp.functional.v"
+`include "sky130_fd_sc_lp__tapvgnd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__tapvgnd2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__tapvgnd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd.v b/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd.v
index de1caa9..695a91d 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__tapvpwrvgnd.pp.functional.v"
+`include "sky130_fd_sc_lp__tapvpwrvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__tapvpwrvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_lp__tapvpwrvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2.v b/cells/xnor2/sky130_fd_sc_lp__xnor2.v
index 6cb5f89..8faf4b6 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2.v
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__xnor2.pp.functional.v"
+`include "sky130_fd_sc_lp__xnor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__xnor2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__xnor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3.v b/cells/xnor3/sky130_fd_sc_lp__xnor3.v
index 980129e..ed0d80d 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3.v
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__xnor3.pp.functional.v"
+`include "sky130_fd_sc_lp__xnor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__xnor3.pp.behavioral.v"
+`include "sky130_fd_sc_lp__xnor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2.v b/cells/xor2/sky130_fd_sc_lp__xor2.v
index 783dca8..ee7af81 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2.v
+++ b/cells/xor2/sky130_fd_sc_lp__xor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__xor2.pp.functional.v"
+`include "sky130_fd_sc_lp__xor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__xor2.pp.behavioral.v"
+`include "sky130_fd_sc_lp__xor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3.v b/cells/xor3/sky130_fd_sc_lp__xor3.v
index 8129e3c..1a0bddc 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3.v
+++ b/cells/xor3/sky130_fd_sc_lp__xor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_lp__xor3.pp.functional.v"
+`include "sky130_fd_sc_lp__xor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_lp__xor3.pp.behavioral.v"
+`include "sky130_fd_sc_lp__xor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS