diff --git a/.gitignore b/.gitignore
index 93865a2a..c43b1528 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,3 @@ test_stale_repositories_log
 *.exe
 # Local Netlify folder
 .netlify
-*.html
-sitemap.xml
diff --git a/main.go b/main.go
index 54e3389e..000e94ac 100644
--- a/main.go
+++ b/main.go
@@ -38,9 +38,9 @@ var staticFiles = []string{
 
 // TODO: embed
 // Templates
-var tplIndex = template.Must(template.ParseFiles("tmpl/tmpl.html"))
-var tplCategoryIndex = template.Must(template.ParseFiles("tmpl/cat-tmpl.html"))
-var tplSitemap = template.Must(template.ParseFiles("tmpl/sitemap-tmpl.xml"))
+var tplIndex = template.Must(template.ParseFiles("tmpl/index.tmpl.html"))
+var tplCategoryIndex = template.Must(template.ParseFiles("tmpl/category-index.tmpl.html"))
+var tplSitemap = template.Must(template.ParseFiles("tmpl/sitemap.tmpl.xml"))
 
 // Output files
 const outDir = "out/" // NOTE: trailing slash is required
diff --git a/tmpl/cat-tmpl.html b/tmpl/category-index.tmpl.html
similarity index 100%
rename from tmpl/cat-tmpl.html
rename to tmpl/category-index.tmpl.html
diff --git a/tmpl/tmpl.html b/tmpl/index.tmpl.html
similarity index 100%
rename from tmpl/tmpl.html
rename to tmpl/index.tmpl.html
diff --git a/tmpl/sitemap-tmpl.xml b/tmpl/sitemap.tmpl.xml
similarity index 100%
rename from tmpl/sitemap-tmpl.xml
rename to tmpl/sitemap.tmpl.xml