diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ff.corner.spice b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ff.corner.spice
index 1c6f9f4..43bce33 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ff.corner.spice
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ff.corner.spice
@@ -1471,4 +1471,4 @@
 + sky130_fd_pr__nfet_01v8__ua_diff_62 = 3.9629e-12
 + sky130_fd_pr__nfet_01v8__ub_diff_62 = 2.0374e-19
 + sky130_fd_pr__nfet_01v8__eta0_diff_62 = 0.0
-.include "sky130_fd_pr__nfet_01v8.pm3.spice"
+.include "sky130_fd_pr__nfet_01v8__ff.pm3.spice"
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__fs.corner.spice b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__fs.corner.spice
index b2fc0a1..836f078 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__fs.corner.spice
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__fs.corner.spice
@@ -1471,4 +1471,4 @@
 + sky130_fd_pr__nfet_01v8__ua_diff_62 = -1.41413e-10
 + sky130_fd_pr__nfet_01v8__ub_diff_62 = -2.642e-19
 + sky130_fd_pr__nfet_01v8__eta0_diff_62 = 0.0
-.include "sky130_fd_pr__nfet_01v8.pm3.spice"
+.include "sky130_fd_pr__nfet_01v8__fs.pm3.spice"
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__sf.corner.spice b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__sf.corner.spice
index 6f967ec..eb91b0d 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__sf.corner.spice
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__sf.corner.spice
@@ -1471,4 +1471,4 @@
 + sky130_fd_pr__nfet_01v8__ua_diff_62 = 2.9602e-12
 + sky130_fd_pr__nfet_01v8__ub_diff_62 = 2.5142e-19
 + sky130_fd_pr__nfet_01v8__eta0_diff_62 = 0.0
-.include "sky130_fd_pr__nfet_01v8.pm3.spice"
+.include "sky130_fd_pr__nfet_01v8__sf.pm3.spice"
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ss.corner.spice b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ss.corner.spice
index 3f02783..cc77cff 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ss.corner.spice
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ss.corner.spice
@@ -1471,4 +1471,4 @@
 + sky130_fd_pr__nfet_01v8__ua_diff_62 = 7.7528e-12
 + sky130_fd_pr__nfet_01v8__ub_diff_62 = -3.1358e-19
 + sky130_fd_pr__nfet_01v8__eta0_diff_62 = 0.0
-.include "sky130_fd_pr__nfet_01v8.pm3.spice"
+.include "sky130_fd_pr__nfet_01v8__ss.pm3.spice"
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt.corner.spice b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt.corner.spice
index de04a40..5f3d829 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt.corner.spice
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt.corner.spice
@@ -1471,4 +1471,4 @@
 + sky130_fd_pr__nfet_01v8__ua_diff_62 = 0.0
 + sky130_fd_pr__nfet_01v8__ub_diff_62 = 0.0
 + sky130_fd_pr__nfet_01v8__eta0_diff_62 = 0.0
-.include "sky130_fd_pr__nfet_01v8.pm3.spice"
+.include "sky130_fd_pr__nfet_01v8__tt.pm3.spice"
diff --git a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ff.corner.spice b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ff.corner.spice
index 59ab0ae..dff917e 100644
--- a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ff.corner.spice
+++ b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ff.corner.spice
@@ -1790,4 +1790,4 @@
 + sky130_fd_pr__pfet_01v8_hvt__u0_diff_67 = 0.0010084
 + sky130_fd_pr__pfet_01v8_hvt__nfactor_diff_67 = 0.6994729
 + sky130_fd_pr__pfet_01v8_hvt__vth0_diff_67 = -0.028431
-.include "sky130_fd_pr__pfet_01v8_hvt.pm3.spice"
+.include "sky130_fd_pr__pfet_01v8_hvt__ff.pm3.spice"
diff --git a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__fs.corner.spice b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__fs.corner.spice
index 5251567..dceea54 100644
--- a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__fs.corner.spice
+++ b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__fs.corner.spice
@@ -1790,4 +1790,4 @@
 + sky130_fd_pr__pfet_01v8_hvt__u0_diff_67 = 0.00053342
 + sky130_fd_pr__pfet_01v8_hvt__nfactor_diff_67 = 0.94327401
 + sky130_fd_pr__pfet_01v8_hvt__vth0_diff_67 = -0.047237
-.include "sky130_fd_pr__pfet_01v8_hvt.pm3.spice"
+.include "sky130_fd_pr__pfet_01v8_hvt__fs.pm3.spice"
diff --git a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__sf.corner.spice b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__sf.corner.spice
index a664add..fa771bd 100644
--- a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__sf.corner.spice
+++ b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__sf.corner.spice
@@ -1790,4 +1790,4 @@
 + sky130_fd_pr__pfet_01v8_hvt__u0_diff_67 = 0.0001194
 + sky130_fd_pr__pfet_01v8_hvt__nfactor_diff_67 = -1.23311554
 + sky130_fd_pr__pfet_01v8_hvt__vth0_diff_67 = 0.0069218
-.include "sky130_fd_pr__pfet_01v8_hvt.pm3.spice"
+.include "sky130_fd_pr__pfet_01v8_hvt__sf.pm3.spice"
diff --git a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ss.corner.spice b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ss.corner.spice
index da38ddd..f7904c7 100644
--- a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ss.corner.spice
+++ b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ss.corner.spice
@@ -1790,4 +1790,4 @@
 + sky130_fd_pr__pfet_01v8_hvt__u0_diff_67 = 0.00028484
 + sky130_fd_pr__pfet_01v8_hvt__nfactor_diff_67 = -0.77623339
 + sky130_fd_pr__pfet_01v8_hvt__vth0_diff_67 = 0.012571
-.include "sky130_fd_pr__pfet_01v8_hvt.pm3.spice"
+.include "sky130_fd_pr__pfet_01v8_hvt__ss.pm3.spice"
diff --git a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt.corner.spice b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt.corner.spice
index 0ff9ef9..6b0413e 100644
--- a/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt.corner.spice
+++ b/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt.corner.spice
@@ -1790,4 +1790,4 @@
 + sky130_fd_pr__pfet_01v8_hvt__u0_diff_67 = -0.00029595
 + sky130_fd_pr__pfet_01v8_hvt__nfactor_diff_67 = 0.0
 + sky130_fd_pr__pfet_01v8_hvt__vth0_diff_67 = 0.0072012
-.include "sky130_fd_pr__pfet_01v8_hvt.pm3.spice"
+.include "sky130_fd_pr__pfet_01v8_hvt__tt.pm3.spice"