diff --git a/scripts/extra-properties.mako.cpp b/scripts/extra-properties.cpp.mako
similarity index 100%
rename from scripts/extra-properties.mako.cpp
rename to scripts/extra-properties.cpp.mako
diff --git a/scripts/extra-properties.py b/scripts/extra-properties.py
index 465f95c..fdb8f9f 100755
--- a/scripts/extra-properties.py
+++ b/scripts/extra-properties.py
@@ -25,7 +25,7 @@
         yamlDict = yaml.safe_load(fd)
 
         # Render the mako template
-        template = os.path.join(script_dir, "extra-properties.mako.cpp")
+        template = os.path.join(script_dir, "extra-properties.cpp.mako")
         t = Template(filename=template)
         with open("extra-properties-gen.cpp", "w") as fd:
             fd.write(t.render(dict=yamlDict))
diff --git a/scripts/fru_gen.py b/scripts/fru_gen.py
index 06208df..8399b6d 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, "writefru.mako.cpp"))
+        t = Template(filename=os.path.join(script_dir, "writefru.cpp.mako"))
 
         output_hpp = os.path.join(output_dir, "fru-gen.cpp")
         with open(output_hpp, "w") as fd:
diff --git a/scripts/writefru.mako.cpp b/scripts/writefru.cpp.mako
similarity index 100%
rename from scripts/writefru.mako.cpp
rename to scripts/writefru.cpp.mako