diff --git a/callouts/callouts-gen.mako.hpp b/callouts/callouts-gen.hpp.mako
similarity index 100%
rename from callouts/callouts-gen.mako.hpp
rename to callouts/callouts-gen.hpp.mako
diff --git a/callouts/callouts.py b/callouts/callouts.py
index abf42f5..d14ad94 100755
--- a/callouts/callouts.py
+++ b/callouts/callouts.py
@@ -32,7 +32,7 @@
         calloutsMap = yaml.safe_load(fd)
 
         # Render the mako template
-        template = os.path.join(script_dir, "callouts-gen.mako.hpp")
+        template = os.path.join(script_dir, "callouts-gen.hpp.mako")
         t = Template(filename=template)
         with open(args.output, "w") as fd:
             fd.write(t.render(calloutsMap=calloutsMap))
diff --git a/meson.build b/meson.build
index 4b544b0..5fd21a2 100644
--- a/meson.build
+++ b/meson.build
@@ -89,7 +89,7 @@
     'callouts-gen.hpp'.underscorify(),
     input: [
         'callouts/callouts.py',
-        'callouts/callouts-gen.mako.hpp',
+        'callouts/callouts-gen.hpp.mako',
         get_option('callout_yaml'),
     ],
     output: 'callouts-gen.hpp',
@@ -100,7 +100,7 @@
     'elog-lookup.cpp'.underscorify(),
     input: files(
         'tools/elog-gen.py',
-        'tools/phosphor-logging/templates/elog-lookup-template.mako.cpp',
+        'tools/phosphor-logging/templates/elog-lookup-template.cpp.mako',
     ),
     output: 'elog-lookup.cpp',
     command: [
@@ -123,7 +123,7 @@
     'elog-process-metadata.cpp'.underscorify(),
     input: files(
         'tools/elog-gen.py',
-        'tools/phosphor-logging/templates/elog-process-metadata.mako.cpp',
+        'tools/phosphor-logging/templates/elog-process-metadata.cpp.mako',
     ),
     output: 'elog-process-metadata.cpp',
     command: [
diff --git a/tools/elog-gen.py b/tools/elog-gen.py
index 2b7fc49..b6991a9 100755
--- a/tools/elog-gen.py
+++ b/tools/elog-gen.py
@@ -288,7 +288,7 @@
         "-m",
         "--mako",
         dest="elog_mako",
-        default="elog-gen-template.mako.hpp",
+        default="elog-gen-template.hpp.mako",
         help="input mako template file to use",
     )
 
diff --git a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp b/tools/phosphor-logging/templates/elog-gen-template.hpp.mako
similarity index 100%
rename from tools/phosphor-logging/templates/elog-gen-template.mako.hpp
rename to tools/phosphor-logging/templates/elog-gen-template.hpp.mako
diff --git a/tools/phosphor-logging/templates/elog-lookup-template.mako.cpp b/tools/phosphor-logging/templates/elog-lookup-template.cpp.mako
similarity index 100%
rename from tools/phosphor-logging/templates/elog-lookup-template.mako.cpp
rename to tools/phosphor-logging/templates/elog-lookup-template.cpp.mako
diff --git a/tools/phosphor-logging/templates/elog-process-metadata.mako.cpp b/tools/phosphor-logging/templates/elog-process-metadata.cpp.mako
similarity index 100%
rename from tools/phosphor-logging/templates/elog-process-metadata.mako.cpp
rename to tools/phosphor-logging/templates/elog-process-metadata.cpp.mako
diff --git a/tools/phosphor-logging/templates/meson.build b/tools/phosphor-logging/templates/meson.build
index e4dd26f..e713aaf 100644
--- a/tools/phosphor-logging/templates/meson.build
+++ b/tools/phosphor-logging/templates/meson.build
@@ -1 +1 @@
-template_elog_gen = files('elog-gen-template.mako.hpp')
+template_elog_gen = files('elog-gen-template.hpp.mako')