diff --git a/util/topgen.py b/util/topgen.py
index 0a74483d262d7..f094b72a8dc9e 100755
--- a/util/topgen.py
+++ b/util/topgen.py
@@ -1458,8 +1458,8 @@ def render_template(template_path: str, rendered_path: Path,
                 render_template(TOPGEN_TEMPLATE_PATH / "data_BUILD.tpl",
                                 path / "data" / "autogen" / "BUILD",
                                 gencmd=gencmd_bzl)
-                # "data_defs.tpl" -> "data/autogen/defs.bzl"
-                render_template(TOPGEN_TEMPLATE_PATH / "data_defs.tpl",
+                # "data_defs.bzl.tpl" -> "data/autogen/defs.bzl"
+                render_template(TOPGEN_TEMPLATE_PATH / "data_defs.bzl.tpl",
                                 path / "data" / "autogen" / "defs.bzl",
                                 gencmd=gencmd_bzl)
 
diff --git a/util/topgen/templates/data_defs.tpl b/util/topgen/templates/data_defs.bzl.tpl
similarity index 100%
rename from util/topgen/templates/data_defs.tpl
rename to util/topgen/templates/data_defs.bzl.tpl