diff --git a/app/assets/javascripts/admin/components/permalinks-list.js.es6 b/app/assets/javascripts/admin/components/permalinks-list.js.es6
index c4254376862..c5027fe8e78 100644
--- a/app/assets/javascripts/admin/components/permalinks-list.js.es6
+++ b/app/assets/javascripts/admin/components/permalinks-list.js.es6
@@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view';
 export default ListView.extend({
   height: 700,
   rowHeight: 32,
-  itemViewClass: ListItemView.extend({templateName: "admin/templates/permalinks_list_item"})
+  itemViewClass: ListItemView.extend({templateName: "admin/templates/permalinks-list-item"})
 });
diff --git a/app/assets/javascripts/admin/components/screened-emails-list.js.es6 b/app/assets/javascripts/admin/components/screened-emails-list.js.es6
index 1b32fb36fe9..aaf883a3c98 100644
--- a/app/assets/javascripts/admin/components/screened-emails-list.js.es6
+++ b/app/assets/javascripts/admin/components/screened-emails-list.js.es6
@@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view';
 export default ListView.extend({
   height: 700,
   rowHeight: 32,
-  itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_emails_list_item"})
+  itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-emails-list-item"})
 });
diff --git a/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 b/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6
index 0d30fc6d48d..83abab4b8ca 100644
--- a/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6
+++ b/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6
@@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view';
 export default ListView.extend({
   height: 700,
   rowHeight: 32,
-  itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_ip_addresses_list_item"})
+  itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-ip-addresses-list-item"})
 });
diff --git a/app/assets/javascripts/admin/components/screened-urls-list.js.es6 b/app/assets/javascripts/admin/components/screened-urls-list.js.es6
index b9d8b76667e..b34bc3fc518 100644
--- a/app/assets/javascripts/admin/components/screened-urls-list.js.es6
+++ b/app/assets/javascripts/admin/components/screened-urls-list.js.es6
@@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view';
 export default ListView.extend({
   height: 700,
   rowHeight: 32,
-  itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_urls_list_item"})
+  itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened-urls-list-item"})
 });
diff --git a/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 b/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6
index cec82dba432..bf681755635 100644
--- a/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6
+++ b/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6
@@ -4,5 +4,5 @@ import ListItemView from 'ember-addons/list-item-view';
 export default ListView.extend({
   height: 700,
   rowHeight: 75,
-  itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/staff_action_logs_list_item"})
+  itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/staff-action-logs-list-item"})
 });
diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
index 1b75e39f6f8..ae1272c0b9f 100644
--- a/app/assets/javascripts/admin/routes/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
@@ -3,9 +3,5 @@ import EmailSettings from 'admin/models/email-settings';
 export default Discourse.Route.extend({
   model() {
     return EmailSettings.find();
-  },
-
-  renderTemplate() {
-    this.render('admin/templates/email_index', { into: 'adminEmail' });
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
index 1008dc1c1db..d31e5219242 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
@@ -1,6 +1,6 @@
 export default Discourse.Route.extend({
   renderTemplate: function() {
-    this.render('admin/templates/logs/screened_emails', {into: 'adminLogs'});
+    this.render('admin/templates/logs/screened-emails', {into: 'adminLogs'});
   },
 
   setupController: function() {
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
index ca914fe1d26..c6518c244c8 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
@@ -1,6 +1,6 @@
 export default Discourse.Route.extend({
   renderTemplate() {
-    this.render('admin/templates/logs/screened_ip_addresses', {into: 'adminLogs'});
+    this.render('admin/templates/logs/screened-ip-addresses', {into: 'adminLogs'});
   },
 
   setupController() {
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
index 093dd263319..ee65fda0900 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
@@ -1,6 +1,6 @@
 export default Discourse.Route.extend({
   renderTemplate: function() {
-    this.render('admin/templates/logs/screened_urls', {into: 'adminLogs'});
+    this.render('admin/templates/logs/screened-urls', {into: 'adminLogs'});
   },
 
   setupController: function() {
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
index 6ef900e8436..8aaa771881d 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
@@ -3,7 +3,7 @@ import showModal from 'discourse/lib/show-modal';
 export default Discourse.Route.extend({
   // TODO: make this automatic using an `{{outlet}}`
   renderTemplate: function() {
-    this.render('admin/templates/logs/staff_action_logs', {into: 'adminLogs'});
+    this.render('admin/templates/logs/staff-action-logs', {into: 'adminLogs'});
   },
 
   setupController: function(controller) {
diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/backups_index.hbs
rename to app/assets/javascripts/admin/templates/backups-index.hbs
diff --git a/app/assets/javascripts/admin/templates/customize_colors.hbs b/app/assets/javascripts/admin/templates/customize-colors.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/customize_colors.hbs
rename to app/assets/javascripts/admin/templates/customize-colors.hbs
diff --git a/app/assets/javascripts/admin/templates/email_index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/email_index.hbs
rename to app/assets/javascripts/admin/templates/email-index.hbs
diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/email_preview_digest.hbs
rename to app/assets/javascripts/admin/templates/email-preview-digest.hbs
diff --git a/app/assets/javascripts/admin/templates/groups_type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/groups_type.hbs
rename to app/assets/javascripts/admin/templates/groups-type.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/details_modal.hbs b/app/assets/javascripts/admin/templates/logs/details-modal.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/details_modal.hbs
rename to app/assets/javascripts/admin/templates/logs/details-modal.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
rename to app/assets/javascripts/admin/templates/logs/screened-emails-list-item.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/screened_emails.hbs
rename to app/assets/javascripts/admin/templates/logs/screened-emails.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
rename to app/assets/javascripts/admin/templates/logs/screened-ip-addresses-list-item.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
rename to app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs
rename to app/assets/javascripts/admin/templates/logs/screened-urls-list-item.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/screened_urls.hbs
rename to app/assets/javascripts/admin/templates/logs/screened-urls.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs b/app/assets/javascripts/admin/templates/logs/site-customization-change-details.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
rename to app/assets/javascripts/admin/templates/logs/site-customization-change-details.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs b/app/assets/javascripts/admin/templates/logs/site-customization-change-modal.hbs
similarity index 86%
rename from app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
rename to app/assets/javascripts/admin/templates/logs/site-customization-change-modal.hbs
index 8d36dd964c6..24f1e18912d 100644
--- a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
+++ b/app/assets/javascripts/admin/templates/logs/site-customization-change-modal.hbs
@@ -11,7 +11,7 @@
     <div class="modal-tab new-tab {{unless newSelected 'invisible'}}">
       {{#if model.new_value}}
         {{#with model.new_value}}
-          {{partial "admin/templates/logs/site_customization_change_details"}}
+          {{partial "admin/templates/logs/site-customization-change-details"}}
         {{/with}}
       {{else}}
         {{i18n 'admin.logs.staff_actions.deleted'}}
@@ -20,7 +20,7 @@
     <div class="modal-tab previous-tab {{unless previousSelected 'invisible'}}">
       {{#if model.previous_value}}
         {{#with model.previous_value}}
-          {{partial "admin/templates/logs/site_customization_change_details"}}
+          {{partial "admin/templates/logs/site-customization-change-details"}}
         {{/with}}
       {{else}}
         {{i18n 'admin.logs.staff_actions.no_previous'}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
rename to app/assets/javascripts/admin/templates/logs/staff-action-logs-list-item.hbs
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
rename to app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
diff --git a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
diff --git a/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
diff --git a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
diff --git a/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
diff --git a/app/assets/javascripts/admin/templates/modal/admin_incoming_email.hbs b/app/assets/javascripts/admin/templates/modal/admin-incoming-email.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/modal/admin_incoming_email.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-incoming-email.hbs
diff --git a/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs b/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
diff --git a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
diff --git a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs b/app/assets/javascripts/admin/templates/permalinks-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/permalinks_list_item.hbs
rename to app/assets/javascripts/admin/templates/permalinks-list-item.hbs
diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/user_badges.hbs
rename to app/assets/javascripts/admin/templates/user-badges.hbs
diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/users_list.hbs
rename to app/assets/javascripts/admin/templates/users-list.hbs
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
index d378084e8a7..e3a7a34f217 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
@@ -38,7 +38,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     if (row.length) { buttonRows.push(row); }
 
     this.set('buttonRows', buttonRows);
-    this.send('changeBulkTemplate', 'modal/bulk_actions_buttons');
+    this.send('changeBulkTemplate', 'modal/bulk-actions-buttons');
   },
 
   perform(operation) {
@@ -85,12 +85,12 @@ export default Ember.Controller.extend(ModalFunctionality, {
     },
 
     showChangeCategory() {
-      this.send('changeBulkTemplate', 'modal/bulk_change_category');
+      this.send('changeBulkTemplate', 'modal/bulk-change-category');
       this.set('modal.modalClass', 'topic-bulk-actions-modal full');
     },
 
     showNotificationLevel() {
-      this.send('changeBulkTemplate', 'modal/bulk_notification_level');
+      this.send('changeBulkTemplate', 'modal/bulk-notification-level');
     },
 
     deleteTopics() {
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs
rename to app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
rename to app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
rename to app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
rename to app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
rename to app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/option_boolean.hbs b/app/assets/javascripts/discourse/templates/modal/option-boolean.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/option_boolean.hbs
rename to app/assets/javascripts/discourse/templates/modal/option-boolean.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/raw_email.hbs b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/raw_email.hbs
rename to app/assets/javascripts/discourse/templates/modal/raw-email.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/search_help.hbs b/app/assets/javascripts/discourse/templates/modal/search-help.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/search_help.hbs
rename to app/assets/javascripts/discourse/templates/modal/search-help.hbs
diff --git a/app/assets/javascripts/discourse/views/raw-email.es6 b/app/assets/javascripts/discourse/views/raw-email.es6
index c14d201f31c..6e96af1626e 100644
--- a/app/assets/javascripts/discourse/views/raw-email.es6
+++ b/app/assets/javascripts/discourse/views/raw-email.es6
@@ -1,7 +1,7 @@
 import ModalBodyView from "discourse/views/modal-body";
 
 export default ModalBodyView.extend({
-  templateName: 'modal/raw_email',
+  templateName: 'modal/raw-email',
   title: I18n.t('raw_email.title'),
 
   resizeModal: function(){