diff --git a/templates/setcss.html b/templates/profileedit.html
similarity index 100%
rename from templates/setcss.html
rename to templates/profileedit.html
diff --git a/templates/wikihome.html b/templates/wikilist.html
similarity index 100%
rename from templates/wikihome.html
rename to templates/wikilist.html
diff --git a/templates/wiki.html b/templates/wikipage.html
similarity index 100%
rename from templates/wiki.html
rename to templates/wikipage.html
diff --git a/webserver.py b/webserver.py
index 4ef82fef..6a95102c 100644
--- a/webserver.py
+++ b/webserver.py
@@ -163,7 +163,7 @@ def page_editprofile():
         db_session.close()
         if user_id is None:
             return redirect(url_for("page_login"))
-        return render_template("setcss.html", data=profile_data, config=config)
+        return render_template("profileedit.html", data=profile_data, config=config)
     elif request.method == "POST":
         if user_id is None:
             return redirect(url_for("page_login"))
@@ -233,7 +233,7 @@ def page_wikihome():
     db_session = db.Session()
     wiki_pages = db_session.query(db.WikiEntry).order_by(db.WikiEntry.key).all()
     db_session.close()
-    return render_template("wikihome.html", wiki_pages=wiki_pages, config=config)
+    return render_template("wikilist.html", wiki_pages=wiki_pages, config=config)
 
 
 @app.route("/wiki/<key>", methods=["GET", "POST"])
@@ -245,7 +245,7 @@ def page_wiki(key: str):
             .order_by(db.WikiLog.timestamp.desc()).first()
         db_session.close()
         if wiki_page is None:
-            return render_template("wiki.html", key=key, config=config)
+            return render_template("wikipage.html", key=key, config=config)
         # Embed YouTube videos
         converted_md = markdown2.markdown(wiki_page.content.replace("<", "&lt;"),
                                           extras=["spoiler", "tables", "smarty-pants", "fenced-code-blocks"])
@@ -254,7 +254,7 @@ def page_wiki(key: str):
                r'   <iframe src="https://www.youtube-nocookie.com/embed/\1?rel=0&amp;showinfo=0" frameborder="0"'
                r' allow="autoplay; encrypted-media" allowfullscreen width="640px" height="320px"></iframe>'
                r'</div>', converted_md)
-        return render_template("wiki.html", key=key, wiki_page=wiki_page, converted_md=Markup(converted_md),
+        return render_template("wikipage.html", key=key, wiki_page=wiki_page, converted_md=Markup(converted_md),
                                wiki_log=wiki_latest_edit, config=config)
     elif request.method == "POST":
         user_id = fl_session.get('user_id')