diff --git a/scripts/fru_gen.py b/scripts/fru_gen.py
index c79cb64..fd0941c 100755
--- a/scripts/fru_gen.py
+++ b/scripts/fru_gen.py
@@ -16,7 +16,7 @@
 
         # Render the mako template
 
-        t = Template(filename=os.path.join(script_dir, "readfru.mako.cpp"))
+        t = Template(filename=os.path.join(script_dir, "readfru.cpp.mako"))
 
         output_hpp = os.path.join(output_dir, "fru-read-gen.cpp")
         with open(output_hpp, "w") as fd:
diff --git a/scripts/inventory-sensor.py b/scripts/inventory-sensor.py
index be5cae6..8c7bc19 100755
--- a/scripts/inventory-sensor.py
+++ b/scripts/inventory-sensor.py
@@ -17,7 +17,7 @@
         # Render the mako template
 
         t = Template(
-            filename=os.path.join(script_dir, "inventorysensor.mako.cpp")
+            filename=os.path.join(script_dir, "inventorysensor.cpp.mako")
         )
 
         output_cpp = os.path.join(output_dir, "inventory-sensor-gen.cpp")
diff --git a/scripts/inventorysensor.mako.cpp b/scripts/inventorysensor.cpp.mako
similarity index 100%
rename from scripts/inventorysensor.mako.cpp
rename to scripts/inventorysensor.cpp.mako
diff --git a/scripts/readfru.mako.cpp b/scripts/readfru.cpp.mako
similarity index 100%
rename from scripts/readfru.mako.cpp
rename to scripts/readfru.cpp.mako
diff --git a/scripts/sensor_gen.py b/scripts/sensor_gen.py
index f121c94..5da5909 100755
--- a/scripts/sensor_gen.py
+++ b/scripts/sensor_gen.py
@@ -16,7 +16,7 @@
 
         # Render the mako template
 
-        t = Template(filename=os.path.join(script_dir, "writesensor.mako.cpp"))
+        t = Template(filename=os.path.join(script_dir, "writesensor.cpp.mako"))
 
         output_cpp = os.path.join(output_dir, "sensor-gen.cpp")
         with open(output_cpp, "w") as fd:
diff --git a/scripts/writesensor.mako.cpp b/scripts/writesensor.cpp.mako
similarity index 100%
rename from scripts/writesensor.mako.cpp
rename to scripts/writesensor.cpp.mako