diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o.v b/cells/a2111o/sky130_fd_sc_ms__a2111o.v
index 5559a8d..f2b90be 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o.v
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a2111o.pp.functional.v"
+`include "sky130_fd_sc_ms__a2111o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a2111o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a2111o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi.v b/cells/a2111oi/sky130_fd_sc_ms__a2111oi.v
index c2b56d3..0edf38c 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi.v
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a2111oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a2111oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a2111oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a2111oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o.v b/cells/a211o/sky130_fd_sc_ms__a211o.v
index 4d97f3d..5a586f5 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o.v
+++ b/cells/a211o/sky130_fd_sc_ms__a211o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a211o.pp.functional.v"
+`include "sky130_fd_sc_ms__a211o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a211o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a211o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi.v b/cells/a211oi/sky130_fd_sc_ms__a211oi.v
index 975e922..307023b 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi.v
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a211oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a211oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a211oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a211oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo.v b/cells/a21bo/sky130_fd_sc_ms__a21bo.v
index 52dc6a1..d62d2de 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo.v
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a21bo.pp.functional.v"
+`include "sky130_fd_sc_ms__a21bo.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a21bo.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a21bo.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi.v b/cells/a21boi/sky130_fd_sc_ms__a21boi.v
index f297411..d707676 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi.v
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a21boi.pp.functional.v"
+`include "sky130_fd_sc_ms__a21boi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a21boi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a21boi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o.v b/cells/a21o/sky130_fd_sc_ms__a21o.v
index 8a8df94..0102226 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o.v
+++ b/cells/a21o/sky130_fd_sc_ms__a21o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a21o.pp.functional.v"
+`include "sky130_fd_sc_ms__a21o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a21o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a21o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi.v b/cells/a21oi/sky130_fd_sc_ms__a21oi.v
index 5a5f0f5..1657fe0 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi.v
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a21oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a21oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a21oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a21oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o.v b/cells/a221o/sky130_fd_sc_ms__a221o.v
index 22bf7fc..e6fa7cf 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o.v
+++ b/cells/a221o/sky130_fd_sc_ms__a221o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a221o.pp.functional.v"
+`include "sky130_fd_sc_ms__a221o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a221o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a221o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi.v b/cells/a221oi/sky130_fd_sc_ms__a221oi.v
index 7b74bed..5b10f23 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi.v
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a221oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a221oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a221oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a221oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o.v b/cells/a222o/sky130_fd_sc_ms__a222o.v
index e49dfd2..f8d86f7 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o.v
+++ b/cells/a222o/sky130_fd_sc_ms__a222o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a222o.pp.functional.v"
+`include "sky130_fd_sc_ms__a222o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a222o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a222o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi.v b/cells/a222oi/sky130_fd_sc_ms__a222oi.v
index e160d8c..8f69e77 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi.v
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a222oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a222oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a222oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a222oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o.v b/cells/a22o/sky130_fd_sc_ms__a22o.v
index b65eaeb..3da976a 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o.v
+++ b/cells/a22o/sky130_fd_sc_ms__a22o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a22o.pp.functional.v"
+`include "sky130_fd_sc_ms__a22o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a22o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a22o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi.v b/cells/a22oi/sky130_fd_sc_ms__a22oi.v
index 9f40b48..091d630 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi.v
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a22oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a22oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a22oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a22oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o.v b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o.v
index 68e1fdf..48bbdea 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o.v
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a2bb2o.pp.functional.v"
+`include "sky130_fd_sc_ms__a2bb2o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a2bb2o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a2bb2o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi.v b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi.v
index e8a726d..f1c51ff 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi.v
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a2bb2oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a2bb2oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a2bb2oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a2bb2oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o.v b/cells/a311o/sky130_fd_sc_ms__a311o.v
index 13c4810..3ed929c 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o.v
+++ b/cells/a311o/sky130_fd_sc_ms__a311o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a311o.pp.functional.v"
+`include "sky130_fd_sc_ms__a311o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a311o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a311o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi.v b/cells/a311oi/sky130_fd_sc_ms__a311oi.v
index dd93664..885c4dc 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi.v
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a311oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a311oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a311oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a311oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o.v b/cells/a31o/sky130_fd_sc_ms__a31o.v
index bd6a9f1..9ba8970 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o.v
+++ b/cells/a31o/sky130_fd_sc_ms__a31o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a31o.pp.functional.v"
+`include "sky130_fd_sc_ms__a31o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a31o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a31o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi.v b/cells/a31oi/sky130_fd_sc_ms__a31oi.v
index b128474..5668cd3 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi.v
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a31oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a31oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a31oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a31oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o.v b/cells/a32o/sky130_fd_sc_ms__a32o.v
index b5da560..5caeca3 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o.v
+++ b/cells/a32o/sky130_fd_sc_ms__a32o.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a32o.pp.functional.v"
+`include "sky130_fd_sc_ms__a32o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a32o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a32o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi.v b/cells/a32oi/sky130_fd_sc_ms__a32oi.v
index a0fee11..44d6153 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi.v
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a32oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a32oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a32oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a32oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o.v b/cells/a41o/sky130_fd_sc_ms__a41o.v
index 963608b..f485941 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o.v
+++ b/cells/a41o/sky130_fd_sc_ms__a41o.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a41o.pp.functional.v"
+`include "sky130_fd_sc_ms__a41o.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a41o.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a41o.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi.v b/cells/a41oi/sky130_fd_sc_ms__a41oi.v
index 312110f..1bddda8 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi.v
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__a41oi.pp.functional.v"
+`include "sky130_fd_sc_ms__a41oi.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__a41oi.pp.behavioral.v"
+`include "sky130_fd_sc_ms__a41oi.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2/sky130_fd_sc_ms__and2.v b/cells/and2/sky130_fd_sc_ms__and2.v
index 54808a5..7d5d029 100644
--- a/cells/and2/sky130_fd_sc_ms__and2.v
+++ b/cells/and2/sky130_fd_sc_ms__and2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__and2.pp.functional.v"
+`include "sky130_fd_sc_ms__and2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__and2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__and2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b.v b/cells/and2b/sky130_fd_sc_ms__and2b.v
index a97e0f0..d077002 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b.v
+++ b/cells/and2b/sky130_fd_sc_ms__and2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__and2b.pp.functional.v"
+`include "sky130_fd_sc_ms__and2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__and2b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__and2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3/sky130_fd_sc_ms__and3.v b/cells/and3/sky130_fd_sc_ms__and3.v
index 2484b87..2162254 100644
--- a/cells/and3/sky130_fd_sc_ms__and3.v
+++ b/cells/and3/sky130_fd_sc_ms__and3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__and3.pp.functional.v"
+`include "sky130_fd_sc_ms__and3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__and3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__and3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b.v b/cells/and3b/sky130_fd_sc_ms__and3b.v
index 064c061..2d2ec21 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b.v
+++ b/cells/and3b/sky130_fd_sc_ms__and3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__and3b.pp.functional.v"
+`include "sky130_fd_sc_ms__and3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__and3b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__and3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4/sky130_fd_sc_ms__and4.v b/cells/and4/sky130_fd_sc_ms__and4.v
index 265ba61..e83395f 100644
--- a/cells/and4/sky130_fd_sc_ms__and4.v
+++ b/cells/and4/sky130_fd_sc_ms__and4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__and4.pp.functional.v"
+`include "sky130_fd_sc_ms__and4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__and4.pp.behavioral.v"
+`include "sky130_fd_sc_ms__and4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b.v b/cells/and4b/sky130_fd_sc_ms__and4b.v
index bea2a65..9bd3d2d 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b.v
+++ b/cells/and4b/sky130_fd_sc_ms__and4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__and4b.pp.functional.v"
+`include "sky130_fd_sc_ms__and4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__and4b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__and4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb.v b/cells/and4bb/sky130_fd_sc_ms__and4bb.v
index e72d193..d7e58c2 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb.v
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__and4bb.pp.functional.v"
+`include "sky130_fd_sc_ms__and4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__and4bb.pp.behavioral.v"
+`include "sky130_fd_sc_ms__and4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/buf/sky130_fd_sc_ms__buf.v b/cells/buf/sky130_fd_sc_ms__buf.v
index bf9e539..ac53ec9 100644
--- a/cells/buf/sky130_fd_sc_ms__buf.v
+++ b/cells/buf/sky130_fd_sc_ms__buf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__buf.pp.functional.v"
+`include "sky130_fd_sc_ms__buf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__buf.pp.behavioral.v"
+`include "sky130_fd_sc_ms__buf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf.v b/cells/bufbuf/sky130_fd_sc_ms__bufbuf.v
index 7a6b52d..55b1ab3 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf.v
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__bufbuf.pp.functional.v"
+`include "sky130_fd_sc_ms__bufbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__bufbuf.pp.behavioral.v"
+`include "sky130_fd_sc_ms__bufbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv.v b/cells/bufinv/sky130_fd_sc_ms__bufinv.v
index cd06211..d987714 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv.v
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__bufinv.pp.functional.v"
+`include "sky130_fd_sc_ms__bufinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__bufinv.pp.behavioral.v"
+`include "sky130_fd_sc_ms__bufinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf.v b/cells/clkbuf/sky130_fd_sc_ms__clkbuf.v
index 5ace94b..b47bfd2 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf.v
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__clkbuf.pp.functional.v"
+`include "sky130_fd_sc_ms__clkbuf.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__clkbuf.pp.behavioral.v"
+`include "sky130_fd_sc_ms__clkbuf.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1.v b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1.v
index 7ba8eec..715031a 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1.v
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv3sd1.pp.functional.v"
+`include "sky130_fd_sc_ms__clkdlyinv3sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv3sd1.pp.behavioral.v"
+`include "sky130_fd_sc_ms__clkdlyinv3sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2.v b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2.v
index d31d25c..840a5a7 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2.v
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv3sd2.pp.functional.v"
+`include "sky130_fd_sc_ms__clkdlyinv3sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv3sd2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__clkdlyinv3sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3.v b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3.v
index 8346674..979c042 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3.v
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv3sd3.pp.functional.v"
+`include "sky130_fd_sc_ms__clkdlyinv3sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv3sd3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__clkdlyinv3sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1.v b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1.v
index bca61ea..354e066 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1.v
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv5sd1.pp.functional.v"
+`include "sky130_fd_sc_ms__clkdlyinv5sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv5sd1.pp.behavioral.v"
+`include "sky130_fd_sc_ms__clkdlyinv5sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2.v b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2.v
index ea8c60b..d1a2a7b 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2.v
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv5sd2.pp.functional.v"
+`include "sky130_fd_sc_ms__clkdlyinv5sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv5sd2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__clkdlyinv5sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3.v b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3.v
index 3b33e84..2fbbcbd 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3.v
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv5sd3.pp.functional.v"
+`include "sky130_fd_sc_ms__clkdlyinv5sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__clkdlyinv5sd3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__clkdlyinv5sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv.v b/cells/clkinv/sky130_fd_sc_ms__clkinv.v
index dc64603..213814b 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv.v
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__clkinv.pp.functional.v"
+`include "sky130_fd_sc_ms__clkinv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__clkinv.pp.behavioral.v"
+`include "sky130_fd_sc_ms__clkinv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/conb/sky130_fd_sc_ms__conb.v b/cells/conb/sky130_fd_sc_ms__conb.v
index c89a8be..4f3fd47 100644
--- a/cells/conb/sky130_fd_sc_ms__conb.v
+++ b/cells/conb/sky130_fd_sc_ms__conb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__conb.pp.functional.v"
+`include "sky130_fd_sc_ms__conb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__conb.pp.behavioral.v"
+`include "sky130_fd_sc_ms__conb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/decap/sky130_fd_sc_ms__decap.v b/cells/decap/sky130_fd_sc_ms__decap.v
index 0f60b3f..cad56ca 100644
--- a/cells/decap/sky130_fd_sc_ms__decap.v
+++ b/cells/decap/sky130_fd_sc_ms__decap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__decap.pp.functional.v"
+`include "sky130_fd_sc_ms__decap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__decap.pp.behavioral.v"
+`include "sky130_fd_sc_ms__decap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn.v b/cells/dfbbn/sky130_fd_sc_ms__dfbbn.v
index 87cae9c..bf6a520 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn.v
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfbbn.pp.functional.v"
+`include "sky130_fd_sc_ms__dfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfbbp/sky130_fd_sc_ms__dfbbp.v b/cells/dfbbp/sky130_fd_sc_ms__dfbbp.v
index 3683307..08eb134 100644
--- a/cells/dfbbp/sky130_fd_sc_ms__dfbbp.v
+++ b/cells/dfbbp/sky130_fd_sc_ms__dfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfbbp.pp.functional.v"
+`include "sky130_fd_sc_ms__dfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp.v b/cells/dfrbp/sky130_fd_sc_ms__dfrbp.v
index 8b53f3b..30cff17 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp.v
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfrbp.pp.functional.v"
+`include "sky130_fd_sc_ms__dfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtn/sky130_fd_sc_ms__dfrtn.v b/cells/dfrtn/sky130_fd_sc_ms__dfrtn.v
index 179ef56..0ff8022 100644
--- a/cells/dfrtn/sky130_fd_sc_ms__dfrtn.v
+++ b/cells/dfrtn/sky130_fd_sc_ms__dfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfrtn.pp.functional.v"
+`include "sky130_fd_sc_ms__dfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp.v b/cells/dfrtp/sky130_fd_sc_ms__dfrtp.v
index 740e12d..97e57fd 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp.v
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfrtp.pp.functional.v"
+`include "sky130_fd_sc_ms__dfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp.v b/cells/dfsbp/sky130_fd_sc_ms__dfsbp.v
index f76835a..b0bd0a1 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp.v
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfsbp.pp.functional.v"
+`include "sky130_fd_sc_ms__dfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp.v b/cells/dfstp/sky130_fd_sc_ms__dfstp.v
index 0f9cd0c..b48d0ed 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp.v
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfstp.pp.functional.v"
+`include "sky130_fd_sc_ms__dfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfstp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp.v b/cells/dfxbp/sky130_fd_sc_ms__dfxbp.v
index b1bb225..45b1829 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp.v
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfxbp.pp.functional.v"
+`include "sky130_fd_sc_ms__dfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp.v b/cells/dfxtp/sky130_fd_sc_ms__dfxtp.v
index 41ffb65..d94ee1c 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp.v
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dfxtp.pp.functional.v"
+`include "sky130_fd_sc_ms__dfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/diode/sky130_fd_sc_ms__diode.v b/cells/diode/sky130_fd_sc_ms__diode.v
index 5f92a35..a5344b8 100644
--- a/cells/diode/sky130_fd_sc_ms__diode.v
+++ b/cells/diode/sky130_fd_sc_ms__diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__diode.pp.functional.v"
+`include "sky130_fd_sc_ms__diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__diode.pp.behavioral.v"
+`include "sky130_fd_sc_ms__diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp.v b/cells/dlclkp/sky130_fd_sc_ms__dlclkp.v
index a338ccf..9f00ab9 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp.v
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlclkp.pp.functional.v"
+`include "sky130_fd_sc_ms__dlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn.v b/cells/dlrbn/sky130_fd_sc_ms__dlrbn.v
index 3ead8e2..f95ce59 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn.v
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlrbn.pp.functional.v"
+`include "sky130_fd_sc_ms__dlrbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlrbn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlrbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp.v b/cells/dlrbp/sky130_fd_sc_ms__dlrbp.v
index 8bc1b69..356bd34 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp.v
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlrbp.pp.functional.v"
+`include "sky130_fd_sc_ms__dlrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlrbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn.v b/cells/dlrtn/sky130_fd_sc_ms__dlrtn.v
index 9bb657a..3f89e3c 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn.v
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlrtn.pp.functional.v"
+`include "sky130_fd_sc_ms__dlrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlrtn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp.v b/cells/dlrtp/sky130_fd_sc_ms__dlrtp.v
index 843aebf..ff236de 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp.v
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlrtp.pp.functional.v"
+`include "sky130_fd_sc_ms__dlrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlrtp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn.v b/cells/dlxbn/sky130_fd_sc_ms__dlxbn.v
index 868f118..177598a 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn.v
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlxbn.pp.functional.v"
+`include "sky130_fd_sc_ms__dlxbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlxbn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlxbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxbp/sky130_fd_sc_ms__dlxbp.v b/cells/dlxbp/sky130_fd_sc_ms__dlxbp.v
index a91d7b6..434555a 100644
--- a/cells/dlxbp/sky130_fd_sc_ms__dlxbp.v
+++ b/cells/dlxbp/sky130_fd_sc_ms__dlxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlxbp.pp.functional.v"
+`include "sky130_fd_sc_ms__dlxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn.v b/cells/dlxtn/sky130_fd_sc_ms__dlxtn.v
index f2fa1e6..3edbf2f 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn.v
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlxtn.pp.functional.v"
+`include "sky130_fd_sc_ms__dlxtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlxtn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlxtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlxtp/sky130_fd_sc_ms__dlxtp.v b/cells/dlxtp/sky130_fd_sc_ms__dlxtp.v
index 1a3ae83..8ceaabc 100644
--- a/cells/dlxtp/sky130_fd_sc_ms__dlxtp.v
+++ b/cells/dlxtp/sky130_fd_sc_ms__dlxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlxtp.pp.functional.v"
+`include "sky130_fd_sc_ms__dlxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1.v b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1.v
index abcf8ff..044a0d3 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlygate4sd1.pp.functional.v"
+`include "sky130_fd_sc_ms__dlygate4sd1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlygate4sd1.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlygate4sd1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2.v b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2.v
index 5a986cb..2d487fd 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlygate4sd2.pp.functional.v"
+`include "sky130_fd_sc_ms__dlygate4sd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlygate4sd2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlygate4sd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3.v b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3.v
index 45541dd..03f8f38 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlygate4sd3.pp.functional.v"
+`include "sky130_fd_sc_ms__dlygate4sd3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlygate4sd3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlygate4sd3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s.v b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s.v
index 2306f67..816cc0b 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s.v
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlymetal6s2s.pp.functional.v"
+`include "sky130_fd_sc_ms__dlymetal6s2s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlymetal6s2s.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlymetal6s2s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s.v b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s.v
index 16676e5..5bc827b 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s.v
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlymetal6s4s.pp.functional.v"
+`include "sky130_fd_sc_ms__dlymetal6s4s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlymetal6s4s.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlymetal6s4s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s.v b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s.v
index b130453..75dee0a 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s.v
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__dlymetal6s6s.pp.functional.v"
+`include "sky130_fd_sc_ms__dlymetal6s6s.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__dlymetal6s6s.pp.behavioral.v"
+`include "sky130_fd_sc_ms__dlymetal6s6s.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn.v b/cells/ebufn/sky130_fd_sc_ms__ebufn.v
index f280a0e..88da0c4 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn.v
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__ebufn.pp.functional.v"
+`include "sky130_fd_sc_ms__ebufn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__ebufn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__ebufn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxbp/sky130_fd_sc_ms__edfxbp.v b/cells/edfxbp/sky130_fd_sc_ms__edfxbp.v
index f821342..188d70f 100644
--- a/cells/edfxbp/sky130_fd_sc_ms__edfxbp.v
+++ b/cells/edfxbp/sky130_fd_sc_ms__edfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__edfxbp.pp.functional.v"
+`include "sky130_fd_sc_ms__edfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__edfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__edfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/edfxtp/sky130_fd_sc_ms__edfxtp.v b/cells/edfxtp/sky130_fd_sc_ms__edfxtp.v
index 6f5076d..6e258a1 100644
--- a/cells/edfxtp/sky130_fd_sc_ms__edfxtp.v
+++ b/cells/edfxtp/sky130_fd_sc_ms__edfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__edfxtp.pp.functional.v"
+`include "sky130_fd_sc_ms__edfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__edfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__edfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn.v b/cells/einvn/sky130_fd_sc_ms__einvn.v
index d1f02b0..1ebce27 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn.v
+++ b/cells/einvn/sky130_fd_sc_ms__einvn.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__einvn.pp.functional.v"
+`include "sky130_fd_sc_ms__einvn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__einvn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__einvn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp.v b/cells/einvp/sky130_fd_sc_ms__einvp.v
index 563742a..945c244 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp.v
+++ b/cells/einvp/sky130_fd_sc_ms__einvp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__einvp.pp.functional.v"
+`include "sky130_fd_sc_ms__einvp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__einvp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__einvp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fa/sky130_fd_sc_ms__fa.v b/cells/fa/sky130_fd_sc_ms__fa.v
index 6fb0c6b..cc33b3b 100644
--- a/cells/fa/sky130_fd_sc_ms__fa.v
+++ b/cells/fa/sky130_fd_sc_ms__fa.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__fa.pp.functional.v"
+`include "sky130_fd_sc_ms__fa.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__fa.pp.behavioral.v"
+`include "sky130_fd_sc_ms__fa.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fah/sky130_fd_sc_ms__fah.v b/cells/fah/sky130_fd_sc_ms__fah.v
index cf6df65..5e311fd 100644
--- a/cells/fah/sky130_fd_sc_ms__fah.v
+++ b/cells/fah/sky130_fd_sc_ms__fah.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__fah.pp.functional.v"
+`include "sky130_fd_sc_ms__fah.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__fah.pp.behavioral.v"
+`include "sky130_fd_sc_ms__fah.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcin/sky130_fd_sc_ms__fahcin.v b/cells/fahcin/sky130_fd_sc_ms__fahcin.v
index 2f8299c..f75dc3d 100644
--- a/cells/fahcin/sky130_fd_sc_ms__fahcin.v
+++ b/cells/fahcin/sky130_fd_sc_ms__fahcin.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__fahcin.pp.functional.v"
+`include "sky130_fd_sc_ms__fahcin.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__fahcin.pp.behavioral.v"
+`include "sky130_fd_sc_ms__fahcin.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fahcon/sky130_fd_sc_ms__fahcon.v b/cells/fahcon/sky130_fd_sc_ms__fahcon.v
index 0664527..c11e92c 100644
--- a/cells/fahcon/sky130_fd_sc_ms__fahcon.v
+++ b/cells/fahcon/sky130_fd_sc_ms__fahcon.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__fahcon.pp.functional.v"
+`include "sky130_fd_sc_ms__fahcon.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__fahcon.pp.behavioral.v"
+`include "sky130_fd_sc_ms__fahcon.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill/sky130_fd_sc_ms__fill.v b/cells/fill/sky130_fd_sc_ms__fill.v
index 48e9c96..5d74266 100644
--- a/cells/fill/sky130_fd_sc_ms__fill.v
+++ b/cells/fill/sky130_fd_sc_ms__fill.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__fill.pp.functional.v"
+`include "sky130_fd_sc_ms__fill.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__fill.pp.behavioral.v"
+`include "sky130_fd_sc_ms__fill.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/fill_diode/sky130_fd_sc_ms__fill_diode.v b/cells/fill_diode/sky130_fd_sc_ms__fill_diode.v
index 9b2f12a..14af4f2 100644
--- a/cells/fill_diode/sky130_fd_sc_ms__fill_diode.v
+++ b/cells/fill_diode/sky130_fd_sc_ms__fill_diode.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__fill_diode.pp.functional.v"
+`include "sky130_fd_sc_ms__fill_diode.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__fill_diode.pp.behavioral.v"
+`include "sky130_fd_sc_ms__fill_diode.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/ha/sky130_fd_sc_ms__ha.v b/cells/ha/sky130_fd_sc_ms__ha.v
index 3a8492d..873547c 100644
--- a/cells/ha/sky130_fd_sc_ms__ha.v
+++ b/cells/ha/sky130_fd_sc_ms__ha.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__ha.pp.functional.v"
+`include "sky130_fd_sc_ms__ha.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__ha.pp.behavioral.v"
+`include "sky130_fd_sc_ms__ha.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/inv/sky130_fd_sc_ms__inv.v b/cells/inv/sky130_fd_sc_ms__inv.v
index 1b361bf..9c0a971 100644
--- a/cells/inv/sky130_fd_sc_ms__inv.v
+++ b/cells/inv/sky130_fd_sc_ms__inv.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__inv.pp.functional.v"
+`include "sky130_fd_sc_ms__inv.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__inv.pp.behavioral.v"
+`include "sky130_fd_sc_ms__inv.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3.v b/cells/maj3/sky130_fd_sc_ms__maj3.v
index da6674a..cbcb94b 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3.v
+++ b/cells/maj3/sky130_fd_sc_ms__maj3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__maj3.pp.functional.v"
+`include "sky130_fd_sc_ms__maj3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__maj3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__maj3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2.v b/cells/mux2/sky130_fd_sc_ms__mux2.v
index f3f4f6f..9e787cb 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2.v
+++ b/cells/mux2/sky130_fd_sc_ms__mux2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__mux2.pp.functional.v"
+`include "sky130_fd_sc_ms__mux2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__mux2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__mux2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i.v b/cells/mux2i/sky130_fd_sc_ms__mux2i.v
index 6f126a0..a30ec33 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i.v
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__mux2i.pp.functional.v"
+`include "sky130_fd_sc_ms__mux2i.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__mux2i.pp.behavioral.v"
+`include "sky130_fd_sc_ms__mux2i.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4.v b/cells/mux4/sky130_fd_sc_ms__mux4.v
index a22041e..26b3838 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4.v
+++ b/cells/mux4/sky130_fd_sc_ms__mux4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__mux4.pp.functional.v"
+`include "sky130_fd_sc_ms__mux4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__mux4.pp.behavioral.v"
+`include "sky130_fd_sc_ms__mux4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2.v b/cells/nand2/sky130_fd_sc_ms__nand2.v
index 87ea334..df59ddb 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2.v
+++ b/cells/nand2/sky130_fd_sc_ms__nand2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nand2.pp.functional.v"
+`include "sky130_fd_sc_ms__nand2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nand2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nand2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b.v b/cells/nand2b/sky130_fd_sc_ms__nand2b.v
index 6fb87bc..f50a1ee 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b.v
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nand2b.pp.functional.v"
+`include "sky130_fd_sc_ms__nand2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nand2b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nand2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3.v b/cells/nand3/sky130_fd_sc_ms__nand3.v
index 6505bb3..de6d325 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3.v
+++ b/cells/nand3/sky130_fd_sc_ms__nand3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nand3.pp.functional.v"
+`include "sky130_fd_sc_ms__nand3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nand3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nand3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b.v b/cells/nand3b/sky130_fd_sc_ms__nand3b.v
index 26a21b9..ec65001 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b.v
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nand3b.pp.functional.v"
+`include "sky130_fd_sc_ms__nand3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nand3b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nand3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4.v b/cells/nand4/sky130_fd_sc_ms__nand4.v
index ffda822..2288f50 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4.v
+++ b/cells/nand4/sky130_fd_sc_ms__nand4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nand4.pp.functional.v"
+`include "sky130_fd_sc_ms__nand4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nand4.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nand4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b.v b/cells/nand4b/sky130_fd_sc_ms__nand4b.v
index 878a054..8ad7542 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b.v
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nand4b.pp.functional.v"
+`include "sky130_fd_sc_ms__nand4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nand4b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nand4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb.v b/cells/nand4bb/sky130_fd_sc_ms__nand4bb.v
index 3cfc530..4c73988 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb.v
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nand4bb.pp.functional.v"
+`include "sky130_fd_sc_ms__nand4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nand4bb.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nand4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2.v b/cells/nor2/sky130_fd_sc_ms__nor2.v
index b30b673..5c549ce 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2.v
+++ b/cells/nor2/sky130_fd_sc_ms__nor2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nor2.pp.functional.v"
+`include "sky130_fd_sc_ms__nor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nor2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b.v b/cells/nor2b/sky130_fd_sc_ms__nor2b.v
index 002a7cd..dbd75ac 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b.v
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nor2b.pp.functional.v"
+`include "sky130_fd_sc_ms__nor2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nor2b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nor2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3.v b/cells/nor3/sky130_fd_sc_ms__nor3.v
index 84a4bd6..32d3c33 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3.v
+++ b/cells/nor3/sky130_fd_sc_ms__nor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nor3.pp.functional.v"
+`include "sky130_fd_sc_ms__nor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nor3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b.v b/cells/nor3b/sky130_fd_sc_ms__nor3b.v
index d05418b..edee597 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b.v
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nor3b.pp.functional.v"
+`include "sky130_fd_sc_ms__nor3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nor3b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nor3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4.v b/cells/nor4/sky130_fd_sc_ms__nor4.v
index fc0de22..0880ca3 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4.v
+++ b/cells/nor4/sky130_fd_sc_ms__nor4.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nor4.pp.functional.v"
+`include "sky130_fd_sc_ms__nor4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nor4.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nor4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b.v b/cells/nor4b/sky130_fd_sc_ms__nor4b.v
index f82c7ba..63ed1d4 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b.v
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nor4b.pp.functional.v"
+`include "sky130_fd_sc_ms__nor4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nor4b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nor4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb.v b/cells/nor4bb/sky130_fd_sc_ms__nor4bb.v
index 0d97225..192964b 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb.v
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__nor4bb.pp.functional.v"
+`include "sky130_fd_sc_ms__nor4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__nor4bb.pp.behavioral.v"
+`include "sky130_fd_sc_ms__nor4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a.v b/cells/o2111a/sky130_fd_sc_ms__o2111a.v
index 36b7f1e..7a273c4 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a.v
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o2111a.pp.functional.v"
+`include "sky130_fd_sc_ms__o2111a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o2111a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o2111a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai.v b/cells/o2111ai/sky130_fd_sc_ms__o2111ai.v
index 10c4132..07ff3e7 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai.v
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o2111ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o2111ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o2111ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o2111ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a.v b/cells/o211a/sky130_fd_sc_ms__o211a.v
index aa74264..5e1947f 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a.v
+++ b/cells/o211a/sky130_fd_sc_ms__o211a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o211a.pp.functional.v"
+`include "sky130_fd_sc_ms__o211a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o211a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o211a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai.v b/cells/o211ai/sky130_fd_sc_ms__o211ai.v
index 95ebe45..0ce9d38 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai.v
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o211ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o211ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o211ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o211ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a.v b/cells/o21a/sky130_fd_sc_ms__o21a.v
index ea33db6..778cfd8 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a.v
+++ b/cells/o21a/sky130_fd_sc_ms__o21a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o21a.pp.functional.v"
+`include "sky130_fd_sc_ms__o21a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o21a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o21a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai.v b/cells/o21ai/sky130_fd_sc_ms__o21ai.v
index 5f9b499..796eef8 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai.v
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o21ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o21ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o21ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o21ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba.v b/cells/o21ba/sky130_fd_sc_ms__o21ba.v
index 811b9c2..36fd386 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba.v
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o21ba.pp.functional.v"
+`include "sky130_fd_sc_ms__o21ba.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o21ba.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o21ba.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai.v b/cells/o21bai/sky130_fd_sc_ms__o21bai.v
index b54537a..36c5205 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai.v
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai.v
@@ -36,9 +36,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o21bai.pp.functional.v"
+`include "sky130_fd_sc_ms__o21bai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o21bai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o21bai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a.v b/cells/o221a/sky130_fd_sc_ms__o221a.v
index 44ff78e..7269caf 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a.v
+++ b/cells/o221a/sky130_fd_sc_ms__o221a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o221a.pp.functional.v"
+`include "sky130_fd_sc_ms__o221a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o221a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o221a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai.v b/cells/o221ai/sky130_fd_sc_ms__o221ai.v
index 3bfc204..8f96b29 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai.v
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o221ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o221ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o221ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o221ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a.v b/cells/o22a/sky130_fd_sc_ms__o22a.v
index 3e08d8b..cace8fd 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a.v
+++ b/cells/o22a/sky130_fd_sc_ms__o22a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o22a.pp.functional.v"
+`include "sky130_fd_sc_ms__o22a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o22a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o22a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai.v b/cells/o22ai/sky130_fd_sc_ms__o22ai.v
index 78a4ce4..d2e1229 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai.v
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o22ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o22ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o22ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o22ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a.v b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a.v
index 3a606ed..db41b54 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a.v
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o2bb2a.pp.functional.v"
+`include "sky130_fd_sc_ms__o2bb2a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o2bb2a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o2bb2a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai.v b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai.v
index 9d16329..60a85ce 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai.v
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o2bb2ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o2bb2ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o2bb2ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o2bb2ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a.v b/cells/o311a/sky130_fd_sc_ms__o311a.v
index 52f9ed1..7785ccf 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a.v
+++ b/cells/o311a/sky130_fd_sc_ms__o311a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o311a.pp.functional.v"
+`include "sky130_fd_sc_ms__o311a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o311a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o311a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai.v b/cells/o311ai/sky130_fd_sc_ms__o311ai.v
index 3cbd542..fd9bfb2 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai.v
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o311ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o311ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o311ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o311ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a.v b/cells/o31a/sky130_fd_sc_ms__o31a.v
index ff6c975..0b7dbbe 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a.v
+++ b/cells/o31a/sky130_fd_sc_ms__o31a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o31a.pp.functional.v"
+`include "sky130_fd_sc_ms__o31a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o31a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o31a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai.v b/cells/o31ai/sky130_fd_sc_ms__o31ai.v
index 991ee27..75d089e 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai.v
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o31ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o31ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o31ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o31ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a.v b/cells/o32a/sky130_fd_sc_ms__o32a.v
index dd1bd39..37ead73 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a.v
+++ b/cells/o32a/sky130_fd_sc_ms__o32a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o32a.pp.functional.v"
+`include "sky130_fd_sc_ms__o32a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o32a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o32a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai.v b/cells/o32ai/sky130_fd_sc_ms__o32ai.v
index 4fb7716..a8c8312 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai.v
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o32ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o32ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o32ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o32ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a.v b/cells/o41a/sky130_fd_sc_ms__o41a.v
index 93bd9eb..de4274f 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a.v
+++ b/cells/o41a/sky130_fd_sc_ms__o41a.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o41a.pp.functional.v"
+`include "sky130_fd_sc_ms__o41a.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o41a.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o41a.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai.v b/cells/o41ai/sky130_fd_sc_ms__o41ai.v
index 29b5b0d..fd4c17a 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai.v
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__o41ai.pp.functional.v"
+`include "sky130_fd_sc_ms__o41ai.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__o41ai.pp.behavioral.v"
+`include "sky130_fd_sc_ms__o41ai.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2/sky130_fd_sc_ms__or2.v b/cells/or2/sky130_fd_sc_ms__or2.v
index 9ad76d5..cc99ea0 100644
--- a/cells/or2/sky130_fd_sc_ms__or2.v
+++ b/cells/or2/sky130_fd_sc_ms__or2.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__or2.pp.functional.v"
+`include "sky130_fd_sc_ms__or2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__or2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__or2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b.v b/cells/or2b/sky130_fd_sc_ms__or2b.v
index 5df0431..47e5583 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b.v
+++ b/cells/or2b/sky130_fd_sc_ms__or2b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__or2b.pp.functional.v"
+`include "sky130_fd_sc_ms__or2b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__or2b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__or2b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3/sky130_fd_sc_ms__or3.v b/cells/or3/sky130_fd_sc_ms__or3.v
index 27a7363..50ad618 100644
--- a/cells/or3/sky130_fd_sc_ms__or3.v
+++ b/cells/or3/sky130_fd_sc_ms__or3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__or3.pp.functional.v"
+`include "sky130_fd_sc_ms__or3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__or3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__or3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b.v b/cells/or3b/sky130_fd_sc_ms__or3b.v
index 028bc1c..d5fb3fa 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b.v
+++ b/cells/or3b/sky130_fd_sc_ms__or3b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__or3b.pp.functional.v"
+`include "sky130_fd_sc_ms__or3b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__or3b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__or3b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4/sky130_fd_sc_ms__or4.v b/cells/or4/sky130_fd_sc_ms__or4.v
index cbe6d65..d04a8ea 100644
--- a/cells/or4/sky130_fd_sc_ms__or4.v
+++ b/cells/or4/sky130_fd_sc_ms__or4.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__or4.pp.functional.v"
+`include "sky130_fd_sc_ms__or4.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__or4.pp.behavioral.v"
+`include "sky130_fd_sc_ms__or4.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b.v b/cells/or4b/sky130_fd_sc_ms__or4b.v
index 18c0976..0435b4d 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b.v
+++ b/cells/or4b/sky130_fd_sc_ms__or4b.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__or4b.pp.functional.v"
+`include "sky130_fd_sc_ms__or4b.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__or4b.pp.behavioral.v"
+`include "sky130_fd_sc_ms__or4b.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb.v b/cells/or4bb/sky130_fd_sc_ms__or4bb.v
index e290dbd..964afaf 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb.v
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__or4bb.pp.functional.v"
+`include "sky130_fd_sc_ms__or4bb.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__or4bb.pp.behavioral.v"
+`include "sky130_fd_sc_ms__or4bb.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn.v b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn.v
index 27fa449..20a696d 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn.v
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfbbn.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfbbn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfbbn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfbbn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp.v b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp.v
index 0969650..fb75e91 100644
--- a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp.v
+++ b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfbbp.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfbbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfbbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfbbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp.v b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp.v
index b83a1dd..15a2629 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp.v
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfrbp.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfrbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfrbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfrbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn.v b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn.v
index 21ba954..a08ab05 100644
--- a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn.v
+++ b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfrtn.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfrtn.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfrtn.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfrtn.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp.v b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp.v
index 34ac1a0..ca4e3a2 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp.v
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfrtp.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfrtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfrtp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfrtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp.v b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp.v
index 5b67280..1316192 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp.v
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfsbp.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfsbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfsbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfsbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp.v b/cells/sdfstp/sky130_fd_sc_ms__sdfstp.v
index 8deb1b2..c80f980 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp.v
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfstp.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfstp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfstp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfstp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp.v b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp.v
index aaf712d..65a3a31 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp.v
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfxbp.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp.v b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp.v
index f1c9c4b..2d4981b 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp.v
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfxtp.pp.functional.v"
+`include "sky130_fd_sc_ms__sdfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp.v b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp.v
index 0cad909..014bc9e 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp.v
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sdlclkp.pp.functional.v"
+`include "sky130_fd_sc_ms__sdlclkp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sdlclkp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sdlclkp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp.v b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp.v
index f1d0e65..e468594 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp.v
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sedfxbp.pp.functional.v"
+`include "sky130_fd_sc_ms__sedfxbp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sedfxbp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sedfxbp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp.v b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp.v
index ba68f2d..2826644 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp.v
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__sedfxtp.pp.functional.v"
+`include "sky130_fd_sc_ms__sedfxtp.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__sedfxtp.pp.behavioral.v"
+`include "sky130_fd_sc_ms__sedfxtp.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tap/sky130_fd_sc_ms__tap.v b/cells/tap/sky130_fd_sc_ms__tap.v
index dec3f31..42bcca9 100644
--- a/cells/tap/sky130_fd_sc_ms__tap.v
+++ b/cells/tap/sky130_fd_sc_ms__tap.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__tap.pp.functional.v"
+`include "sky130_fd_sc_ms__tap.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__tap.pp.behavioral.v"
+`include "sky130_fd_sc_ms__tap.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapmet1/sky130_fd_sc_ms__tapmet1.v b/cells/tapmet1/sky130_fd_sc_ms__tapmet1.v
index 3ce3841..230269e 100644
--- a/cells/tapmet1/sky130_fd_sc_ms__tapmet1.v
+++ b/cells/tapmet1/sky130_fd_sc_ms__tapmet1.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__tapmet1.pp.functional.v"
+`include "sky130_fd_sc_ms__tapmet1.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__tapmet1.pp.behavioral.v"
+`include "sky130_fd_sc_ms__tapmet1.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd.v b/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd.v
index da40010..911edb7 100644
--- a/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd.v
+++ b/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__tapvgnd.pp.functional.v"
+`include "sky130_fd_sc_ms__tapvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__tapvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_ms__tapvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2.v b/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2.v
index ae794c1..920ef2f 100644
--- a/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2.v
+++ b/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2.v
@@ -34,9 +34,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__tapvgnd2.pp.functional.v"
+`include "sky130_fd_sc_ms__tapvgnd2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__tapvgnd2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__tapvgnd2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd.v b/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd.v
index 89a9701..e4a7568 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__tapvpwrvgnd.pp.functional.v"
+`include "sky130_fd_sc_ms__tapvpwrvgnd.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__tapvpwrvgnd.pp.behavioral.v"
+`include "sky130_fd_sc_ms__tapvpwrvgnd.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2.v b/cells/xnor2/sky130_fd_sc_ms__xnor2.v
index 66b03ef..4be35a2 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2.v
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__xnor2.pp.functional.v"
+`include "sky130_fd_sc_ms__xnor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__xnor2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__xnor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3.v b/cells/xnor3/sky130_fd_sc_ms__xnor3.v
index eb5cd6c..d3ab0e5 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3.v
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3.v
@@ -33,9 +33,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__xnor3.pp.functional.v"
+`include "sky130_fd_sc_ms__xnor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__xnor3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__xnor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2.v b/cells/xor2/sky130_fd_sc_ms__xor2.v
index fe814ce..b123309 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2.v
+++ b/cells/xor2/sky130_fd_sc_ms__xor2.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__xor2.pp.functional.v"
+`include "sky130_fd_sc_ms__xor2.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__xor2.pp.behavioral.v"
+`include "sky130_fd_sc_ms__xor2.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3.v b/cells/xor3/sky130_fd_sc_ms__xor3.v
index 7383dd3..fcc0eda 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3.v
+++ b/cells/xor3/sky130_fd_sc_ms__xor3.v
@@ -35,9 +35,9 @@
 `ifdef USE_POWER_PINS
 
 `ifdef FUNCTIONAL
-`include "sky130_fd_sc_ms__xor3.pp.functional.v"
+`include "sky130_fd_sc_ms__xor3.functional.pp.v"
 `else  // FUNCTIONAL
-`include "sky130_fd_sc_ms__xor3.pp.behavioral.v"
+`include "sky130_fd_sc_ms__xor3.behavioral.pp.v"
 `endif // FUNCTIONAL
 
 `else  // USE_POWER_PINS