diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o.v b/cells/a2111o/sky130_fd_sc_ls__a2111o.v
index 36bb778..a125b4d 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o.v
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a2111o.pp.functional.v"
+`include "sky130_fd_sc_ls__a2111o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a2111o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a2111o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi.v b/cells/a2111oi/sky130_fd_sc_ls__a2111oi.v
index 4e67de8..dad0a03 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi.v
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a2111oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a2111oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a2111oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a2111oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o.v b/cells/a211o/sky130_fd_sc_ls__a211o.v
index 1b6284c..c205584 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o.v
+++ b/cells/a211o/sky130_fd_sc_ls__a211o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a211o.pp.functional.v"
+`include "sky130_fd_sc_ls__a211o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a211o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a211o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi.v b/cells/a211oi/sky130_fd_sc_ls__a211oi.v
index 8aece16..888dc55 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi.v
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a211oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a211oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a211oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a211oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo.v b/cells/a21bo/sky130_fd_sc_ls__a21bo.v
index 8a641d3..b676b3c 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo.v
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a21bo.pp.functional.v"
+`include "sky130_fd_sc_ls__a21bo.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a21bo.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a21bo.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi.v b/cells/a21boi/sky130_fd_sc_ls__a21boi.v
index 750daf3..c937538 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi.v
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a21boi.pp.functional.v"
+`include "sky130_fd_sc_ls__a21boi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a21boi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a21boi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o.v b/cells/a21o/sky130_fd_sc_ls__a21o.v
index 9d5bf93..e4ef080 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o.v
+++ b/cells/a21o/sky130_fd_sc_ls__a21o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a21o.pp.functional.v"
+`include "sky130_fd_sc_ls__a21o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a21o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a21o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi.v b/cells/a21oi/sky130_fd_sc_ls__a21oi.v
index dc58eba..72bd4cb 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi.v
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a21oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a21oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a21oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a21oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o.v b/cells/a221o/sky130_fd_sc_ls__a221o.v
index 36e98cb..bef03b3 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o.v
+++ b/cells/a221o/sky130_fd_sc_ls__a221o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a221o.pp.functional.v"
+`include "sky130_fd_sc_ls__a221o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a221o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a221o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi.v b/cells/a221oi/sky130_fd_sc_ls__a221oi.v
index 46088ce..c09eeae 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi.v
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a221oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a221oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a221oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a221oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o.v b/cells/a222o/sky130_fd_sc_ls__a222o.v
index a6b18b0..bc02542 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o.v
+++ b/cells/a222o/sky130_fd_sc_ls__a222o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a222o.pp.functional.v"
+`include "sky130_fd_sc_ls__a222o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a222o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a222o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi.v b/cells/a222oi/sky130_fd_sc_ls__a222oi.v
index 4185cca..70b8a18 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi.v
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a222oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a222oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a222oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a222oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o.v b/cells/a22o/sky130_fd_sc_ls__a22o.v
index bf698ce..e798867 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o.v
+++ b/cells/a22o/sky130_fd_sc_ls__a22o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a22o.pp.functional.v"
+`include "sky130_fd_sc_ls__a22o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a22o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a22o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi.v b/cells/a22oi/sky130_fd_sc_ls__a22oi.v
index fade5e2..a4eee10 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi.v
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a22oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a22oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a22oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a22oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o.v b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o.v
index 0e3ac1d..708875d 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o.v
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a2bb2o.pp.functional.v"
+`include "sky130_fd_sc_ls__a2bb2o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a2bb2o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a2bb2o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi.v b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi.v
index d39c4a3..cb6799b 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi.v
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a2bb2oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a2bb2oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a2bb2oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a2bb2oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o.v b/cells/a311o/sky130_fd_sc_ls__a311o.v
index 22cc2ac..38d731c 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o.v
+++ b/cells/a311o/sky130_fd_sc_ls__a311o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a311o.pp.functional.v"
+`include "sky130_fd_sc_ls__a311o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a311o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a311o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi.v b/cells/a311oi/sky130_fd_sc_ls__a311oi.v
index b68d11d..1d7457e 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi.v
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a311oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a311oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a311oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a311oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o.v b/cells/a31o/sky130_fd_sc_ls__a31o.v
index fe51de9..4d8872c 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o.v
+++ b/cells/a31o/sky130_fd_sc_ls__a31o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a31o.pp.functional.v"
+`include "sky130_fd_sc_ls__a31o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a31o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a31o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi.v b/cells/a31oi/sky130_fd_sc_ls__a31oi.v
index b22068b..cb8b5b1 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi.v
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a31oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a31oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a31oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a31oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o.v b/cells/a32o/sky130_fd_sc_ls__a32o.v
index a2804ad..61741f0 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o.v
+++ b/cells/a32o/sky130_fd_sc_ls__a32o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a32o.pp.functional.v"
+`include "sky130_fd_sc_ls__a32o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a32o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a32o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi.v b/cells/a32oi/sky130_fd_sc_ls__a32oi.v
index c10b878..2590c81 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi.v
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a32oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a32oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a32oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a32oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o.v b/cells/a41o/sky130_fd_sc_ls__a41o.v
index 99c05fd..2eef2ed 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o.v
+++ b/cells/a41o/sky130_fd_sc_ls__a41o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a41o.pp.functional.v"
+`include "sky130_fd_sc_ls__a41o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a41o.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a41o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi.v b/cells/a41oi/sky130_fd_sc_ls__a41oi.v
index 47184b8..5c30f7c 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi.v
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__a41oi.pp.functional.v"
+`include "sky130_fd_sc_ls__a41oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__a41oi.pp.behavioral.v"
+`include "sky130_fd_sc_ls__a41oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2/sky130_fd_sc_ls__and2.v b/cells/and2/sky130_fd_sc_ls__and2.v
index 5b8ea46..9b36b8d 100644
--- a/cells/and2/sky130_fd_sc_ls__and2.v
+++ b/cells/and2/sky130_fd_sc_ls__and2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__and2.pp.functional.v"
+`include "sky130_fd_sc_ls__and2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__and2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__and2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b.v b/cells/and2b/sky130_fd_sc_ls__and2b.v
index b5d9b9d..78b2c8f 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b.v
+++ b/cells/and2b/sky130_fd_sc_ls__and2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__and2b.pp.functional.v"
+`include "sky130_fd_sc_ls__and2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__and2b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__and2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3/sky130_fd_sc_ls__and3.v b/cells/and3/sky130_fd_sc_ls__and3.v
index 556670b..4c7e727 100644
--- a/cells/and3/sky130_fd_sc_ls__and3.v
+++ b/cells/and3/sky130_fd_sc_ls__and3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__and3.pp.functional.v"
+`include "sky130_fd_sc_ls__and3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__and3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__and3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b.v b/cells/and3b/sky130_fd_sc_ls__and3b.v
index eecc1a2..88890a7 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b.v
+++ b/cells/and3b/sky130_fd_sc_ls__and3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__and3b.pp.functional.v"
+`include "sky130_fd_sc_ls__and3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__and3b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__and3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4/sky130_fd_sc_ls__and4.v b/cells/and4/sky130_fd_sc_ls__and4.v
index 4cf2e14..c00e193 100644
--- a/cells/and4/sky130_fd_sc_ls__and4.v
+++ b/cells/and4/sky130_fd_sc_ls__and4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__and4.pp.functional.v"
+`include "sky130_fd_sc_ls__and4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__and4.pp.behavioral.v"
+`include "sky130_fd_sc_ls__and4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b.v b/cells/and4b/sky130_fd_sc_ls__and4b.v
index 9081698..341d17e 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b.v
+++ b/cells/and4b/sky130_fd_sc_ls__and4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__and4b.pp.functional.v"
+`include "sky130_fd_sc_ls__and4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__and4b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__and4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb.v b/cells/and4bb/sky130_fd_sc_ls__and4bb.v
index d1322e6..c33f12e 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb.v
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__and4bb.pp.functional.v"
+`include "sky130_fd_sc_ls__and4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__and4bb.pp.behavioral.v"
+`include "sky130_fd_sc_ls__and4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/buf/sky130_fd_sc_ls__buf.v b/cells/buf/sky130_fd_sc_ls__buf.v
index 2340c62..22c9c20 100644
--- a/cells/buf/sky130_fd_sc_ls__buf.v
+++ b/cells/buf/sky130_fd_sc_ls__buf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__buf.pp.functional.v"
+`include "sky130_fd_sc_ls__buf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__buf.pp.behavioral.v"
+`include "sky130_fd_sc_ls__buf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf.v b/cells/bufbuf/sky130_fd_sc_ls__bufbuf.v
index af47f03..dc8d84c 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf.v
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__bufbuf.pp.functional.v"
+`include "sky130_fd_sc_ls__bufbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__bufbuf.pp.behavioral.v"
+`include "sky130_fd_sc_ls__bufbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv.v b/cells/bufinv/sky130_fd_sc_ls__bufinv.v
index c09ed21..29caba5 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv.v
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__bufinv.pp.functional.v"
+`include "sky130_fd_sc_ls__bufinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__bufinv.pp.behavioral.v"
+`include "sky130_fd_sc_ls__bufinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf.v b/cells/clkbuf/sky130_fd_sc_ls__clkbuf.v
index 70c4dd1..8b004e1 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf.v
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__clkbuf.pp.functional.v"
+`include "sky130_fd_sc_ls__clkbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__clkbuf.pp.behavioral.v"
+`include "sky130_fd_sc_ls__clkbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1.v b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1.v
index 500b1a6..69b14f1 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1.v
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv3sd1.pp.functional.v"
+`include "sky130_fd_sc_ls__clkdlyinv3sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv3sd1.pp.behavioral.v"
+`include "sky130_fd_sc_ls__clkdlyinv3sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2.v b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2.v
index 559e211..efcd198 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2.v
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv3sd2.pp.functional.v"
+`include "sky130_fd_sc_ls__clkdlyinv3sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv3sd2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__clkdlyinv3sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3.v b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3.v
index b83a922..4c66e7f 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3.v
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv3sd3.pp.functional.v"
+`include "sky130_fd_sc_ls__clkdlyinv3sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv3sd3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__clkdlyinv3sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1.v b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1.v
index ec9a0ad..214a017 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1.v
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv5sd1.pp.functional.v"
+`include "sky130_fd_sc_ls__clkdlyinv5sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv5sd1.pp.behavioral.v"
+`include "sky130_fd_sc_ls__clkdlyinv5sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2.v b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2.v
index 5e1b2fa..c06ca0b 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2.v
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv5sd2.pp.functional.v"
+`include "sky130_fd_sc_ls__clkdlyinv5sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv5sd2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__clkdlyinv5sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3.v b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3.v
index 7ef1950..13566cc 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3.v
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv5sd3.pp.functional.v"
+`include "sky130_fd_sc_ls__clkdlyinv5sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__clkdlyinv5sd3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__clkdlyinv5sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv.v b/cells/clkinv/sky130_fd_sc_ls__clkinv.v
index 616cf4e..1fdf371 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv.v
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__clkinv.pp.functional.v"
+`include "sky130_fd_sc_ls__clkinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__clkinv.pp.behavioral.v"
+`include "sky130_fd_sc_ls__clkinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/conb/sky130_fd_sc_ls__conb.v b/cells/conb/sky130_fd_sc_ls__conb.v
index 0769f4f..1f2d91e 100644
--- a/cells/conb/sky130_fd_sc_ls__conb.v
+++ b/cells/conb/sky130_fd_sc_ls__conb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__conb.pp.functional.v"
+`include "sky130_fd_sc_ls__conb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__conb.pp.behavioral.v"
+`include "sky130_fd_sc_ls__conb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decap/sky130_fd_sc_ls__decap.v b/cells/decap/sky130_fd_sc_ls__decap.v
index 9ce5e77..359602d 100644
--- a/cells/decap/sky130_fd_sc_ls__decap.v
+++ b/cells/decap/sky130_fd_sc_ls__decap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__decap.pp.functional.v"
+`include "sky130_fd_sc_ls__decap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__decap.pp.behavioral.v"
+`include "sky130_fd_sc_ls__decap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe.v b/cells/decaphe/sky130_fd_sc_ls__decaphe.v
index 7c3d2e9..78b29c4 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe.v
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__decaphe.pp.functional.v"
+`include "sky130_fd_sc_ls__decaphe.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__decaphe.pp.behavioral.v"
+`include "sky130_fd_sc_ls__decaphe.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decaphetap/sky130_fd_sc_ls__decaphetap.v b/cells/decaphetap/sky130_fd_sc_ls__decaphetap.v
index f7d7f4b..c0c25d9 100644
--- a/cells/decaphetap/sky130_fd_sc_ls__decaphetap.v
+++ b/cells/decaphetap/sky130_fd_sc_ls__decaphetap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__decaphetap.pp.functional.v"
+`include "sky130_fd_sc_ls__decaphetap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__decaphetap.pp.behavioral.v"
+`include "sky130_fd_sc_ls__decaphetap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn.v b/cells/dfbbn/sky130_fd_sc_ls__dfbbn.v
index ffcbd60..a2e4175 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn.v
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfbbn.pp.functional.v"
+`include "sky130_fd_sc_ls__dfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbp/sky130_fd_sc_ls__dfbbp.v b/cells/dfbbp/sky130_fd_sc_ls__dfbbp.v
index 84f320d..a53cbd0 100644
--- a/cells/dfbbp/sky130_fd_sc_ls__dfbbp.v
+++ b/cells/dfbbp/sky130_fd_sc_ls__dfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfbbp.pp.functional.v"
+`include "sky130_fd_sc_ls__dfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp.v b/cells/dfrbp/sky130_fd_sc_ls__dfrbp.v
index 6831d28..bb065f5 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp.v
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfrbp.pp.functional.v"
+`include "sky130_fd_sc_ls__dfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtn/sky130_fd_sc_ls__dfrtn.v b/cells/dfrtn/sky130_fd_sc_ls__dfrtn.v
index 7d394fe..7ea15ba 100644
--- a/cells/dfrtn/sky130_fd_sc_ls__dfrtn.v
+++ b/cells/dfrtn/sky130_fd_sc_ls__dfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfrtn.pp.functional.v"
+`include "sky130_fd_sc_ls__dfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp.v b/cells/dfrtp/sky130_fd_sc_ls__dfrtp.v
index c65174a..0b93d50 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp.v
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfrtp.pp.functional.v"
+`include "sky130_fd_sc_ls__dfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp.v b/cells/dfsbp/sky130_fd_sc_ls__dfsbp.v
index c6e7de7..54e2332 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp.v
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfsbp.pp.functional.v"
+`include "sky130_fd_sc_ls__dfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp.v b/cells/dfstp/sky130_fd_sc_ls__dfstp.v
index 9f04f7a..72ecb49 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp.v
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfstp.pp.functional.v"
+`include "sky130_fd_sc_ls__dfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfstp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp.v b/cells/dfxbp/sky130_fd_sc_ls__dfxbp.v
index 45ac372..b8c3bf6 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp.v
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfxbp.pp.functional.v"
+`include "sky130_fd_sc_ls__dfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp.v b/cells/dfxtp/sky130_fd_sc_ls__dfxtp.v
index bcda055..8201e6b 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp.v
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dfxtp.pp.functional.v"
+`include "sky130_fd_sc_ls__dfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/diode/sky130_fd_sc_ls__diode.v b/cells/diode/sky130_fd_sc_ls__diode.v
index e2d87e0..887fb09 100644
--- a/cells/diode/sky130_fd_sc_ls__diode.v
+++ b/cells/diode/sky130_fd_sc_ls__diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__diode.pp.functional.v"
+`include "sky130_fd_sc_ls__diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__diode.pp.behavioral.v"
+`include "sky130_fd_sc_ls__diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp.v b/cells/dlclkp/sky130_fd_sc_ls__dlclkp.v
index 58beb1e..a4b9097 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp.v
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlclkp.pp.functional.v"
+`include "sky130_fd_sc_ls__dlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn.v b/cells/dlrbn/sky130_fd_sc_ls__dlrbn.v
index c7170d8..549ead3 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn.v
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlrbn.pp.functional.v"
+`include "sky130_fd_sc_ls__dlrbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlrbn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlrbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp.v b/cells/dlrbp/sky130_fd_sc_ls__dlrbp.v
index 7d8d828..0ae0782 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp.v
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlrbp.pp.functional.v"
+`include "sky130_fd_sc_ls__dlrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlrbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn.v b/cells/dlrtn/sky130_fd_sc_ls__dlrtn.v
index 89a0ee9..0e0273f 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn.v
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlrtn.pp.functional.v"
+`include "sky130_fd_sc_ls__dlrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlrtn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp.v b/cells/dlrtp/sky130_fd_sc_ls__dlrtp.v
index 515c2a7..1c3f35c 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp.v
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlrtp.pp.functional.v"
+`include "sky130_fd_sc_ls__dlrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlrtp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn.v b/cells/dlxbn/sky130_fd_sc_ls__dlxbn.v
index b1ca602..18594a8 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn.v
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlxbn.pp.functional.v"
+`include "sky130_fd_sc_ls__dlxbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlxbn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlxbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbp/sky130_fd_sc_ls__dlxbp.v b/cells/dlxbp/sky130_fd_sc_ls__dlxbp.v
index fc8ab1f..37c9f69 100644
--- a/cells/dlxbp/sky130_fd_sc_ls__dlxbp.v
+++ b/cells/dlxbp/sky130_fd_sc_ls__dlxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlxbp.pp.functional.v"
+`include "sky130_fd_sc_ls__dlxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn.v b/cells/dlxtn/sky130_fd_sc_ls__dlxtn.v
index 8e1d095..474a734 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn.v
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlxtn.pp.functional.v"
+`include "sky130_fd_sc_ls__dlxtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlxtn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlxtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtp/sky130_fd_sc_ls__dlxtp.v b/cells/dlxtp/sky130_fd_sc_ls__dlxtp.v
index ef63220..b086063 100644
--- a/cells/dlxtp/sky130_fd_sc_ls__dlxtp.v
+++ b/cells/dlxtp/sky130_fd_sc_ls__dlxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlxtp.pp.functional.v"
+`include "sky130_fd_sc_ls__dlxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1.v b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1.v
index 2271470..d47cb97 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlygate4sd1.pp.functional.v"
+`include "sky130_fd_sc_ls__dlygate4sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlygate4sd1.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlygate4sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2.v b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2.v
index 25bdb36..85e6a61 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlygate4sd2.pp.functional.v"
+`include "sky130_fd_sc_ls__dlygate4sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlygate4sd2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlygate4sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3.v b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3.v
index 076342c..d5e7013 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlygate4sd3.pp.functional.v"
+`include "sky130_fd_sc_ls__dlygate4sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlygate4sd3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlygate4sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s.v b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s.v
index 2b677d9..eb2e504 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlymetal6s2s.pp.functional.v"
+`include "sky130_fd_sc_ls__dlymetal6s2s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlymetal6s2s.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlymetal6s2s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s.v b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s.v
index 8b8fba7..7202f12 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlymetal6s4s.pp.functional.v"
+`include "sky130_fd_sc_ls__dlymetal6s4s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlymetal6s4s.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlymetal6s4s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s.v b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s.v
index d77d18b..0b6f9a6 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__dlymetal6s6s.pp.functional.v"
+`include "sky130_fd_sc_ls__dlymetal6s6s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__dlymetal6s6s.pp.behavioral.v"
+`include "sky130_fd_sc_ls__dlymetal6s6s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn.v b/cells/ebufn/sky130_fd_sc_ls__ebufn.v
index d37ee12..d366537 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn.v
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__ebufn.pp.functional.v"
+`include "sky130_fd_sc_ls__ebufn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__ebufn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__ebufn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxbp/sky130_fd_sc_ls__edfxbp.v b/cells/edfxbp/sky130_fd_sc_ls__edfxbp.v
index 3b370c1..92611a5 100644
--- a/cells/edfxbp/sky130_fd_sc_ls__edfxbp.v
+++ b/cells/edfxbp/sky130_fd_sc_ls__edfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__edfxbp.pp.functional.v"
+`include "sky130_fd_sc_ls__edfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__edfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__edfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxtp/sky130_fd_sc_ls__edfxtp.v b/cells/edfxtp/sky130_fd_sc_ls__edfxtp.v
index dee0951..2e9bc82 100644
--- a/cells/edfxtp/sky130_fd_sc_ls__edfxtp.v
+++ b/cells/edfxtp/sky130_fd_sc_ls__edfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__edfxtp.pp.functional.v"
+`include "sky130_fd_sc_ls__edfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__edfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__edfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn.v b/cells/einvn/sky130_fd_sc_ls__einvn.v
index 9deeaab..035aa98 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn.v
+++ b/cells/einvn/sky130_fd_sc_ls__einvn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__einvn.pp.functional.v"
+`include "sky130_fd_sc_ls__einvn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__einvn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__einvn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp.v b/cells/einvp/sky130_fd_sc_ls__einvp.v
index ecad150..f0ea534 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp.v
+++ b/cells/einvp/sky130_fd_sc_ls__einvp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__einvp.pp.functional.v"
+`include "sky130_fd_sc_ls__einvp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__einvp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__einvp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fa/sky130_fd_sc_ls__fa.v b/cells/fa/sky130_fd_sc_ls__fa.v
index 1b821b6..3c58686 100644
--- a/cells/fa/sky130_fd_sc_ls__fa.v
+++ b/cells/fa/sky130_fd_sc_ls__fa.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__fa.pp.functional.v"
+`include "sky130_fd_sc_ls__fa.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__fa.pp.behavioral.v"
+`include "sky130_fd_sc_ls__fa.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fah/sky130_fd_sc_ls__fah.v b/cells/fah/sky130_fd_sc_ls__fah.v
index e79eed5..ccd2b93 100644
--- a/cells/fah/sky130_fd_sc_ls__fah.v
+++ b/cells/fah/sky130_fd_sc_ls__fah.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__fah.pp.functional.v"
+`include "sky130_fd_sc_ls__fah.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__fah.pp.behavioral.v"
+`include "sky130_fd_sc_ls__fah.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcin/sky130_fd_sc_ls__fahcin.v b/cells/fahcin/sky130_fd_sc_ls__fahcin.v
index 19b1c25..0337f91 100644
--- a/cells/fahcin/sky130_fd_sc_ls__fahcin.v
+++ b/cells/fahcin/sky130_fd_sc_ls__fahcin.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__fahcin.pp.functional.v"
+`include "sky130_fd_sc_ls__fahcin.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__fahcin.pp.behavioral.v"
+`include "sky130_fd_sc_ls__fahcin.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcon/sky130_fd_sc_ls__fahcon.v b/cells/fahcon/sky130_fd_sc_ls__fahcon.v
index c952997..386de9e 100644
--- a/cells/fahcon/sky130_fd_sc_ls__fahcon.v
+++ b/cells/fahcon/sky130_fd_sc_ls__fahcon.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__fahcon.pp.functional.v"
+`include "sky130_fd_sc_ls__fahcon.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__fahcon.pp.behavioral.v"
+`include "sky130_fd_sc_ls__fahcon.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill/sky130_fd_sc_ls__fill.v b/cells/fill/sky130_fd_sc_ls__fill.v
index 6ad6d6a..245fa9c 100644
--- a/cells/fill/sky130_fd_sc_ls__fill.v
+++ b/cells/fill/sky130_fd_sc_ls__fill.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__fill.pp.functional.v"
+`include "sky130_fd_sc_ls__fill.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__fill.pp.behavioral.v"
+`include "sky130_fd_sc_ls__fill.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill_diode/sky130_fd_sc_ls__fill_diode.v b/cells/fill_diode/sky130_fd_sc_ls__fill_diode.v
index 892760d..d3c3650 100644
--- a/cells/fill_diode/sky130_fd_sc_ls__fill_diode.v
+++ b/cells/fill_diode/sky130_fd_sc_ls__fill_diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__fill_diode.pp.functional.v"
+`include "sky130_fd_sc_ls__fill_diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__fill_diode.pp.behavioral.v"
+`include "sky130_fd_sc_ls__fill_diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ha/sky130_fd_sc_ls__ha.v b/cells/ha/sky130_fd_sc_ls__ha.v
index 6dc1e9a..450b3a0 100644
--- a/cells/ha/sky130_fd_sc_ls__ha.v
+++ b/cells/ha/sky130_fd_sc_ls__ha.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__ha.pp.functional.v"
+`include "sky130_fd_sc_ls__ha.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__ha.pp.behavioral.v"
+`include "sky130_fd_sc_ls__ha.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inv/sky130_fd_sc_ls__inv.v b/cells/inv/sky130_fd_sc_ls__inv.v
index 23a83c8..e61115f 100644
--- a/cells/inv/sky130_fd_sc_ls__inv.v
+++ b/cells/inv/sky130_fd_sc_ls__inv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__inv.pp.functional.v"
+`include "sky130_fd_sc_ls__inv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__inv.pp.behavioral.v"
+`include "sky130_fd_sc_ls__inv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3.v b/cells/maj3/sky130_fd_sc_ls__maj3.v
index ebf751d..77af611 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3.v
+++ b/cells/maj3/sky130_fd_sc_ls__maj3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__maj3.pp.functional.v"
+`include "sky130_fd_sc_ls__maj3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__maj3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__maj3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2.v b/cells/mux2/sky130_fd_sc_ls__mux2.v
index 987bc60..7b815be 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2.v
+++ b/cells/mux2/sky130_fd_sc_ls__mux2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__mux2.pp.functional.v"
+`include "sky130_fd_sc_ls__mux2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__mux2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__mux2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i.v b/cells/mux2i/sky130_fd_sc_ls__mux2i.v
index 3810a90..39f6154 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i.v
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__mux2i.pp.functional.v"
+`include "sky130_fd_sc_ls__mux2i.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__mux2i.pp.behavioral.v"
+`include "sky130_fd_sc_ls__mux2i.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4.v b/cells/mux4/sky130_fd_sc_ls__mux4.v
index 8bd0a97..58cf396 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4.v
+++ b/cells/mux4/sky130_fd_sc_ls__mux4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__mux4.pp.functional.v"
+`include "sky130_fd_sc_ls__mux4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__mux4.pp.behavioral.v"
+`include "sky130_fd_sc_ls__mux4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2.v b/cells/nand2/sky130_fd_sc_ls__nand2.v
index f2975e9..67adedd 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2.v
+++ b/cells/nand2/sky130_fd_sc_ls__nand2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nand2.pp.functional.v"
+`include "sky130_fd_sc_ls__nand2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nand2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nand2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b.v b/cells/nand2b/sky130_fd_sc_ls__nand2b.v
index f33e080..a968b87 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b.v
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nand2b.pp.functional.v"
+`include "sky130_fd_sc_ls__nand2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nand2b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nand2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3.v b/cells/nand3/sky130_fd_sc_ls__nand3.v
index 5181a72..b6650f8 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3.v
+++ b/cells/nand3/sky130_fd_sc_ls__nand3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nand3.pp.functional.v"
+`include "sky130_fd_sc_ls__nand3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nand3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nand3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b.v b/cells/nand3b/sky130_fd_sc_ls__nand3b.v
index 8b182ab..8b60c92 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b.v
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nand3b.pp.functional.v"
+`include "sky130_fd_sc_ls__nand3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nand3b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nand3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4.v b/cells/nand4/sky130_fd_sc_ls__nand4.v
index 5755122..abd5bdd 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4.v
+++ b/cells/nand4/sky130_fd_sc_ls__nand4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nand4.pp.functional.v"
+`include "sky130_fd_sc_ls__nand4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nand4.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nand4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b.v b/cells/nand4b/sky130_fd_sc_ls__nand4b.v
index c7b6d9a..5f2754a 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b.v
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nand4b.pp.functional.v"
+`include "sky130_fd_sc_ls__nand4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nand4b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nand4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb.v b/cells/nand4bb/sky130_fd_sc_ls__nand4bb.v
index 4e7583a..5132581 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb.v
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nand4bb.pp.functional.v"
+`include "sky130_fd_sc_ls__nand4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nand4bb.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nand4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2.v b/cells/nor2/sky130_fd_sc_ls__nor2.v
index 4f2defc..a5a67ee 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2.v
+++ b/cells/nor2/sky130_fd_sc_ls__nor2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nor2.pp.functional.v"
+`include "sky130_fd_sc_ls__nor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nor2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b.v b/cells/nor2b/sky130_fd_sc_ls__nor2b.v
index 22ae2f0..054ff19 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b.v
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nor2b.pp.functional.v"
+`include "sky130_fd_sc_ls__nor2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nor2b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nor2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3.v b/cells/nor3/sky130_fd_sc_ls__nor3.v
index 82d2bb5..d1b0e99 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3.v
+++ b/cells/nor3/sky130_fd_sc_ls__nor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nor3.pp.functional.v"
+`include "sky130_fd_sc_ls__nor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nor3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b.v b/cells/nor3b/sky130_fd_sc_ls__nor3b.v
index 830481a..f7d7364 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b.v
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nor3b.pp.functional.v"
+`include "sky130_fd_sc_ls__nor3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nor3b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nor3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4.v b/cells/nor4/sky130_fd_sc_ls__nor4.v
index 4d24b4a..ff06b48 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4.v
+++ b/cells/nor4/sky130_fd_sc_ls__nor4.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nor4.pp.functional.v"
+`include "sky130_fd_sc_ls__nor4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nor4.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nor4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b.v b/cells/nor4b/sky130_fd_sc_ls__nor4b.v
index 6a2f717..b49dcf3 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b.v
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nor4b.pp.functional.v"
+`include "sky130_fd_sc_ls__nor4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nor4b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nor4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb.v b/cells/nor4bb/sky130_fd_sc_ls__nor4bb.v
index 54cc4a3..e689206 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb.v
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__nor4bb.pp.functional.v"
+`include "sky130_fd_sc_ls__nor4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__nor4bb.pp.behavioral.v"
+`include "sky130_fd_sc_ls__nor4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a.v b/cells/o2111a/sky130_fd_sc_ls__o2111a.v
index 6e77fa0..e4ba5b8 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a.v
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o2111a.pp.functional.v"
+`include "sky130_fd_sc_ls__o2111a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o2111a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o2111a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai.v b/cells/o2111ai/sky130_fd_sc_ls__o2111ai.v
index a1a9991..d4d6796 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai.v
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o2111ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o2111ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o2111ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o2111ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a.v b/cells/o211a/sky130_fd_sc_ls__o211a.v
index bb59511..03c54d6 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a.v
+++ b/cells/o211a/sky130_fd_sc_ls__o211a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o211a.pp.functional.v"
+`include "sky130_fd_sc_ls__o211a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o211a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o211a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai.v b/cells/o211ai/sky130_fd_sc_ls__o211ai.v
index b78ae08..51db5b2 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai.v
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o211ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o211ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o211ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o211ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a.v b/cells/o21a/sky130_fd_sc_ls__o21a.v
index b0c3913..a07cea3 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a.v
+++ b/cells/o21a/sky130_fd_sc_ls__o21a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o21a.pp.functional.v"
+`include "sky130_fd_sc_ls__o21a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o21a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o21a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai.v b/cells/o21ai/sky130_fd_sc_ls__o21ai.v
index 374df99..3c2adaf 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai.v
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o21ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o21ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o21ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o21ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba.v b/cells/o21ba/sky130_fd_sc_ls__o21ba.v
index 0cb1e0e..26efcd7 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba.v
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o21ba.pp.functional.v"
+`include "sky130_fd_sc_ls__o21ba.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o21ba.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o21ba.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai.v b/cells/o21bai/sky130_fd_sc_ls__o21bai.v
index 069faf3..f747b20 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai.v
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o21bai.pp.functional.v"
+`include "sky130_fd_sc_ls__o21bai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o21bai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o21bai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a.v b/cells/o221a/sky130_fd_sc_ls__o221a.v
index 9273f86..8519efc 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a.v
+++ b/cells/o221a/sky130_fd_sc_ls__o221a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o221a.pp.functional.v"
+`include "sky130_fd_sc_ls__o221a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o221a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o221a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai.v b/cells/o221ai/sky130_fd_sc_ls__o221ai.v
index 2071e29..3a9de76 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai.v
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o221ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o221ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o221ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o221ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a.v b/cells/o22a/sky130_fd_sc_ls__o22a.v
index 3e9fd5e..ca4cbb9 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a.v
+++ b/cells/o22a/sky130_fd_sc_ls__o22a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o22a.pp.functional.v"
+`include "sky130_fd_sc_ls__o22a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o22a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o22a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai.v b/cells/o22ai/sky130_fd_sc_ls__o22ai.v
index b547444..8bb978e 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai.v
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o22ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o22ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o22ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o22ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a.v b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a.v
index 9968bb7..9acd116 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a.v
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o2bb2a.pp.functional.v"
+`include "sky130_fd_sc_ls__o2bb2a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o2bb2a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o2bb2a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai.v b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai.v
index 6e902e7..4f1896a 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai.v
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o2bb2ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o2bb2ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o2bb2ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o2bb2ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a.v b/cells/o311a/sky130_fd_sc_ls__o311a.v
index f550a58..a6d0c19 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a.v
+++ b/cells/o311a/sky130_fd_sc_ls__o311a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o311a.pp.functional.v"
+`include "sky130_fd_sc_ls__o311a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o311a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o311a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai.v b/cells/o311ai/sky130_fd_sc_ls__o311ai.v
index 6b98d4b..9ee3d0b 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai.v
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o311ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o311ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o311ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o311ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a.v b/cells/o31a/sky130_fd_sc_ls__o31a.v
index 8575783..e6ffbab 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a.v
+++ b/cells/o31a/sky130_fd_sc_ls__o31a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o31a.pp.functional.v"
+`include "sky130_fd_sc_ls__o31a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o31a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o31a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai.v b/cells/o31ai/sky130_fd_sc_ls__o31ai.v
index 99f46b2..c7c5e0c 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai.v
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o31ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o31ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o31ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o31ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a.v b/cells/o32a/sky130_fd_sc_ls__o32a.v
index 5e1da47..3fb5a85 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a.v
+++ b/cells/o32a/sky130_fd_sc_ls__o32a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o32a.pp.functional.v"
+`include "sky130_fd_sc_ls__o32a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o32a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o32a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai.v b/cells/o32ai/sky130_fd_sc_ls__o32ai.v
index 80837f1..9b97f30 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai.v
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o32ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o32ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o32ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o32ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a.v b/cells/o41a/sky130_fd_sc_ls__o41a.v
index fd32888..2af60a5 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a.v
+++ b/cells/o41a/sky130_fd_sc_ls__o41a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o41a.pp.functional.v"
+`include "sky130_fd_sc_ls__o41a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o41a.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o41a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai.v b/cells/o41ai/sky130_fd_sc_ls__o41ai.v
index acbfc23..a6aca4e 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai.v
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__o41ai.pp.functional.v"
+`include "sky130_fd_sc_ls__o41ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__o41ai.pp.behavioral.v"
+`include "sky130_fd_sc_ls__o41ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2/sky130_fd_sc_ls__or2.v b/cells/or2/sky130_fd_sc_ls__or2.v
index d57cc9c..80b3cd3 100644
--- a/cells/or2/sky130_fd_sc_ls__or2.v
+++ b/cells/or2/sky130_fd_sc_ls__or2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__or2.pp.functional.v"
+`include "sky130_fd_sc_ls__or2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__or2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__or2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b.v b/cells/or2b/sky130_fd_sc_ls__or2b.v
index 026f525..8b897c9 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b.v
+++ b/cells/or2b/sky130_fd_sc_ls__or2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__or2b.pp.functional.v"
+`include "sky130_fd_sc_ls__or2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__or2b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__or2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3/sky130_fd_sc_ls__or3.v b/cells/or3/sky130_fd_sc_ls__or3.v
index 473cf03..3946043 100644
--- a/cells/or3/sky130_fd_sc_ls__or3.v
+++ b/cells/or3/sky130_fd_sc_ls__or3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__or3.pp.functional.v"
+`include "sky130_fd_sc_ls__or3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__or3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__or3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b.v b/cells/or3b/sky130_fd_sc_ls__or3b.v
index d3d2d29..9ce5068 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b.v
+++ b/cells/or3b/sky130_fd_sc_ls__or3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__or3b.pp.functional.v"
+`include "sky130_fd_sc_ls__or3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__or3b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__or3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4/sky130_fd_sc_ls__or4.v b/cells/or4/sky130_fd_sc_ls__or4.v
index 7fdd93b..f5db8e6 100644
--- a/cells/or4/sky130_fd_sc_ls__or4.v
+++ b/cells/or4/sky130_fd_sc_ls__or4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__or4.pp.functional.v"
+`include "sky130_fd_sc_ls__or4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__or4.pp.behavioral.v"
+`include "sky130_fd_sc_ls__or4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b.v b/cells/or4b/sky130_fd_sc_ls__or4b.v
index 12f2f6f..3ee7732 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b.v
+++ b/cells/or4b/sky130_fd_sc_ls__or4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__or4b.pp.functional.v"
+`include "sky130_fd_sc_ls__or4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__or4b.pp.behavioral.v"
+`include "sky130_fd_sc_ls__or4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb.v b/cells/or4bb/sky130_fd_sc_ls__or4bb.v
index feee517..933e0eb 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb.v
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__or4bb.pp.functional.v"
+`include "sky130_fd_sc_ls__or4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__or4bb.pp.behavioral.v"
+`include "sky130_fd_sc_ls__or4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn.v b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn.v
index 8489f0f..930287b 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn.v
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfbbn.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp.v b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp.v
index e20e83e..ed93d9d 100644
--- a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp.v
+++ b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfbbp.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp.v b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp.v
index b4cfff2..01da906 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp.v
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfrbp.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn.v b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn.v
index 3977113..0fffbb5 100644
--- a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn.v
+++ b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfrtn.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp.v b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp.v
index 77df7a9..5ea6e6a 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp.v
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfrtp.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp.v b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp.v
index be32233..56051b1 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp.v
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfsbp.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp.v b/cells/sdfstp/sky130_fd_sc_ls__sdfstp.v
index 7365759..d7c5cdf 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp.v
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfstp.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfstp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp.v b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp.v
index 74df355..7653223 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp.v
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfxbp.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp.v b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp.v
index 10812b0..48dc27a 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp.v
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfxtp.pp.functional.v"
+`include "sky130_fd_sc_ls__sdfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp.v b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp.v
index 81243b2..eed77ef 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp.v
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sdlclkp.pp.functional.v"
+`include "sky130_fd_sc_ls__sdlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sdlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sdlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp.v b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp.v
index 21a3a64..0149156 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp.v
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sedfxbp.pp.functional.v"
+`include "sky130_fd_sc_ls__sedfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sedfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sedfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp.v b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp.v
index b0f224c..cf4cd73 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp.v
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__sedfxtp.pp.functional.v"
+`include "sky130_fd_sc_ls__sedfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__sedfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ls__sedfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tap/sky130_fd_sc_ls__tap.v b/cells/tap/sky130_fd_sc_ls__tap.v
index 6e50925..19b1789 100644
--- a/cells/tap/sky130_fd_sc_ls__tap.v
+++ b/cells/tap/sky130_fd_sc_ls__tap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__tap.pp.functional.v"
+`include "sky130_fd_sc_ls__tap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__tap.pp.behavioral.v"
+`include "sky130_fd_sc_ls__tap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapmet1/sky130_fd_sc_ls__tapmet1.v b/cells/tapmet1/sky130_fd_sc_ls__tapmet1.v
index b09d727..ac00201 100644
--- a/cells/tapmet1/sky130_fd_sc_ls__tapmet1.v
+++ b/cells/tapmet1/sky130_fd_sc_ls__tapmet1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__tapmet1.pp.functional.v"
+`include "sky130_fd_sc_ls__tapmet1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__tapmet1.pp.behavioral.v"
+`include "sky130_fd_sc_ls__tapmet1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd.v b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd.v
index 39e1dc6..00655a2 100644
--- a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd.v
+++ b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__tapvgnd.pp.functional.v"
+`include "sky130_fd_sc_ls__tapvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__tapvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_ls__tapvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2.v b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2.v
index ec1ea39..c0a95b3 100644
--- a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2.v
+++ b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__tapvgnd2.pp.functional.v"
+`include "sky130_fd_sc_ls__tapvgnd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__tapvgnd2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__tapvgnd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb.v b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb.v
index a9417f5..e286f7a 100644
--- a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb.v
+++ b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__tapvgndnovpb.pp.functional.v"
+`include "sky130_fd_sc_ls__tapvgndnovpb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__tapvgndnovpb.pp.behavioral.v"
+`include "sky130_fd_sc_ls__tapvgndnovpb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd.v b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd.v
index 9c12f0c..c2b92f4 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__tapvpwrvgnd.pp.functional.v"
+`include "sky130_fd_sc_ls__tapvpwrvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__tapvpwrvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_ls__tapvpwrvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2.v b/cells/xnor2/sky130_fd_sc_ls__xnor2.v
index 9ee74f3..a6598d5 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2.v
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__xnor2.pp.functional.v"
+`include "sky130_fd_sc_ls__xnor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__xnor2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__xnor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3.v b/cells/xnor3/sky130_fd_sc_ls__xnor3.v
index 0033ebd..fe6970f 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3.v
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__xnor3.pp.functional.v"
+`include "sky130_fd_sc_ls__xnor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__xnor3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__xnor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2.v b/cells/xor2/sky130_fd_sc_ls__xor2.v
index 3f92f52..8a8fa81 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2.v
+++ b/cells/xor2/sky130_fd_sc_ls__xor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__xor2.pp.functional.v"
+`include "sky130_fd_sc_ls__xor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__xor2.pp.behavioral.v"
+`include "sky130_fd_sc_ls__xor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3.v b/cells/xor3/sky130_fd_sc_ls__xor3.v
index 9ad2627..6e8c173 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3.v
+++ b/cells/xor3/sky130_fd_sc_ls__xor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ls__xor3.pp.functional.v"
+`include "sky130_fd_sc_ls__xor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ls__xor3.pp.behavioral.v"
+`include "sky130_fd_sc_ls__xor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS