diff --git a/src/api/admin.rs b/src/api/admin.rs
index 1cddf6290049ac6bc9d87b03272f63f453ed637c..681cf14876975c2e8e1cc0fd842a365ab6cfda40 100644
--- a/src/api/admin.rs
+++ b/src/api/admin.rs
@@ -35,7 +35,7 @@ impl AdminTemplateData {
     fn login(error: Option<String>) -> Self {
         Self {
             users: Vec::new(),
-            page_content: String::from("admin/admin_login"),
+            page_content: String::from("admin/login"),
             error,
         }
     }
@@ -43,13 +43,13 @@ impl AdminTemplateData {
     fn admin(users: Vec<Value>) -> Self {
         Self {
             users,
-            page_content: String::from("admin/admin_page"),
+            page_content: String::from("admin/page"),
             error: None,
         }
     }
 
     fn render(self) -> Result<String, Error> {
-        CONFIG.templates.render("admin/admin_base", &self).map_err(Into::into)
+        CONFIG.templates.render("admin/base", &self).map_err(Into::into)
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index 028d26e2d483650470c87db24700ab48eedb711d..9861abc8da4a299f9b753d5ae7cbf2eff87e24d5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -352,9 +352,9 @@ fn load_templates(path: String) -> Handlebars {
     reg!("email/pw_hint_some");
     reg!("email/send_org_invite");
 
-    reg!("admin/admin_base");
-    reg!("admin/admin_login");
-    reg!("admin/admin_page");
+    reg!("admin/base");
+    reg!("admin/login");
+    reg!("admin/page");
 
     // And then load user templates to overwrite the defaults
     // Use .hbs extension for the files
diff --git a/src/static/templates/admin/admin_base.hbs b/src/static/templates/admin/base.hbs
similarity index 100%
rename from src/static/templates/admin/admin_base.hbs
rename to src/static/templates/admin/base.hbs
diff --git a/src/static/templates/admin/admin_login.hbs b/src/static/templates/admin/login.hbs
similarity index 100%
rename from src/static/templates/admin/admin_login.hbs
rename to src/static/templates/admin/login.hbs
diff --git a/src/static/templates/admin/admin_page.hbs b/src/static/templates/admin/page.hbs
similarity index 100%
rename from src/static/templates/admin/admin_page.hbs
rename to src/static/templates/admin/page.hbs