FIX: Later versions of ember require dashes in template names

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"})
 });

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"})
 });

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"})
 });

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"})
 });

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"})
 });

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' });
   }
 });

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() {

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() {

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() {

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) {

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'}}

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() {

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(){