diff --git a/resources/skins.minerva.notifications.badge/NotificationBadge.js b/resources/skins.minerva.notifications.badge/NotificationBadge.js
index f39254f..19df955 100644
--- a/resources/skins.minerva.notifications.badge/NotificationBadge.js
+++ b/resources/skins.minerva.notifications.badge/NotificationBadge.js
@@ -58,7 +58,7 @@
 	}
 
 	mfExtend( NotificationBadge, View, {
-		template: mw.template.get( 'skins.minerva.notifications.badge', 'badge.hogan' ),
+		template: mw.template.get( 'skins.minerva.notifications.badge', 'badge.mustache' ),
 		/**
 		 * Update the notification count
 		 * @memberof NotificationBadge
diff --git a/resources/skins.minerva.options/BackToTopOverlay.js b/resources/skins.minerva.options/BackToTopOverlay.js
index cc721ff..e21e8a6 100644
--- a/resources/skins.minerva.options/BackToTopOverlay.js
+++ b/resources/skins.minerva.options/BackToTopOverlay.js
@@ -21,7 +21,7 @@
 	}
 
 	mfExtend( BackToTopOverlay, View, {
-		template: mw.template.get( 'skins.minerva.options', 'BackToTopOverlay.hogan' ),
+		template: mw.template.get( 'skins.minerva.options', 'BackToTopOverlay.mustache' ),
 
 		/**
 		 * Show the back to top element, if it's not visible already.
diff --git a/resources/skins.minerva.options/BackToTopOverlay.hogan b/resources/skins.minerva.options/BackToTopOverlay.mustache
similarity index 100%
rename from resources/skins.minerva.options/BackToTopOverlay.hogan
rename to resources/skins.minerva.options/BackToTopOverlay.mustache
diff --git a/resources/skins.minerva.scripts/menu/MainMenu.js b/resources/skins.minerva.scripts/menu/MainMenu.js
index 446849f..96137d2 100644
--- a/resources/skins.minerva.scripts/menu/MainMenu.js
+++ b/resources/skins.minerva.scripts/menu/MainMenu.js
@@ -19,9 +19,9 @@
 
 	mfExtend( MainMenu, View, {
 		isTemplateMode: true,
-		template: mw.template.get( 'skins.minerva.scripts', 'menu.hogan' ),
+		template: mw.template.get( 'skins.minerva.scripts', 'menu.mustache' ),
 		templatePartials: {
-			menuGroup: mw.template.get( 'skins.minerva.scripts', 'menuGroup.hogan' )
+			menuGroup: mw.template.get( 'skins.minerva.scripts', 'menuGroup.mustache' )
 		},
 
 		/**
diff --git a/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js b/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js
index 9b0fca7..cdcaaae 100644
--- a/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js
+++ b/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js
@@ -16,7 +16,7 @@
 	}
 	mfExtend( IssueNotice, View, {
 		tagName: 'li',
-		template: mw.template.get( 'skins.minerva.scripts', 'IssueNotice.hogan' ),
+		template: mw.template.get( 'skins.minerva.scripts', 'IssueNotice.mustache' ),
 		postRender: function () {
 			View.prototype.postRender.apply( this, arguments );
 			this.$el.find( '.issue-notice' ).prepend( this.options.issue.icon.$el );
diff --git a/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.hogan b/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.mustache
similarity index 100%
rename from resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.hogan
rename to resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.mustache
diff --git a/skin.json b/skin.json
index 18c1419..9bb2012 100644
--- a/skin.json
+++ b/skin.json
@@ -460,9 +460,9 @@
 				"resources/skins.minerva.scripts/page-issues/overlay/PageIssuesOverlay.less"
 			],
 			"templates": {
-				"IssueNotice.hogan": "resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.hogan",
-				"menu.hogan": "resources/skins.minerva.scripts/menu/menu.mustache",
-				"menuGroup.hogan": "resources/skins.minerva.scripts/menu/menuGroup.mustache"
+				"IssueNotice.mustache": "resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.mustache",
+				"menu.mustache": "resources/skins.minerva.scripts/menu/menu.mustache",
+				"menuGroup.mustache": "resources/skins.minerva.scripts/menu/menuGroup.mustache"
 			},
 			"scripts": [
 				"resources/skins.minerva.scripts/menu/schema.js",
@@ -503,7 +503,7 @@
 				"resources/skins.minerva.notifications.badge/NotificationBadge.js"
 			],
 			"templates": {
-				"badge.hogan": "includes/skins/secondaryButton.mustache"
+				"badge.mustache": "includes/skins/secondaryButton.mustache"
 			},
 			"targets": [
 				"mobile",
@@ -549,7 +549,7 @@
 				"skin-minerva-share"
 			],
 			"templates": {
-				"BackToTopOverlay.hogan": "resources/skins.minerva.options/BackToTopOverlay.hogan"
+				"BackToTopOverlay.mustache": "resources/skins.minerva.options/BackToTopOverlay.mustache"
 			},
 			"styles": [
 				"resources/skins.minerva.options/backtotop.less"
diff --git a/tests/qunit/skins.minerva.scripts/stubs.js b/tests/qunit/skins.minerva.scripts/stubs.js
index 8c6a7b2..0e5cfc5 100644
--- a/tests/qunit/skins.minerva.scripts/stubs.js
+++ b/tests/qunit/skins.minerva.scripts/stubs.js
@@ -1,4 +1,4 @@
 // Since tests.minerva.scripts does
 // not pull in the entire module skins.minerva.scripts
 // we have to stub certain templates to make it appear like its been loaded.
-mw.template.add( 'skins.minerva.scripts', 'IssueNotice.hogan', '' );
+mw.template.add( 'skins.minerva.scripts', 'IssueNotice.mustache', '' );