diff --git a/.gitignore b/.gitignore
index ab8e681a28..f920e25d65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@ projectFilesBackup
 # Ghost DB file
 *.db
 
-/core/admin/assets/tmpl/hbs-tmpl.js
+/core/admin/assets/tpl/hbs-tpl.js
 /core/admin/assets/css
 /core/admin/assets/sass/modules/bourbon
 .sass-cache/
diff --git a/Gruntfile.js b/Gruntfile.js
index ddd06168a6..a2435a709a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -33,7 +33,7 @@
                         // Lint files in the root, including Gruntfile.js
                         "*.js",
                         // Lint core files, but not libs
-                        ["core/**/*.js", "!**/assets/lib/**/*.js", "!**/assets/tmpl/*.js"]
+                        ["core/**/*.js", "!**/assets/lib/**/*.js", "!**/assets/tpl/*.js"]
                     ]
                 },
 
@@ -92,19 +92,19 @@
                         options: {
                             namespace: "JST",
                             processName: function (filename) {
-                                filename = filename.replace('./core/admin/assets/tmpl/', '');
+                                filename = filename.replace('./core/admin/assets/tpl/', '');
                                 return filename.replace('.hbs', '');
                             }
                         },
                         files: {
-                            "<%= paths.adminAssets %>/tmpl/hbs-tmpl.js": "<%= paths.adminAssets %>/tmpl/**/*.hbs"
+                            "<%= paths.adminAssets %>/tpl/hbs-tpl.js": "<%= paths.adminAssets %>/tpl/**/*.hbs"
                         }
                     }
                 },
 
                 watch: {
                     handlebars: {
-                        files: '<%= paths.adminAssets %>/tmpl/**/*.hbs',
+                        files: '<%= paths.adminAssets %>/tpl/**/*.hbs',
                         tasks: ['handlebars']
                     },
                     sass: {
diff --git a/core/admin/assets/tmpl/content/list-item.hbs b/core/admin/assets/tpl/list-item.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/list-item.hbs
rename to core/admin/assets/tpl/list-item.hbs
diff --git a/core/admin/assets/tmpl/content/preview.hbs b/core/admin/assets/tpl/preview.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/preview.hbs
rename to core/admin/assets/tpl/preview.hbs
diff --git a/core/admin/assets/tmpl/content/widget.hbs b/core/admin/assets/tpl/widget.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widget.hbs
rename to core/admin/assets/tpl/widget.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/custom/instagram.hbs b/core/admin/assets/tpl/widgets/custom/instagram.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/custom/instagram.hbs
rename to core/admin/assets/tpl/widgets/custom/instagram.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/custom/lastfm.hbs b/core/admin/assets/tpl/widgets/custom/lastfm.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/custom/lastfm.hbs
rename to core/admin/assets/tpl/widgets/custom/lastfm.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/custom/popular-posts.hbs b/core/admin/assets/tpl/widgets/custom/popular-posts.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/custom/popular-posts.hbs
rename to core/admin/assets/tpl/widgets/custom/popular-posts.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/custom/post-ideas.hbs b/core/admin/assets/tpl/widgets/custom/post-ideas.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/custom/post-ideas.hbs
rename to core/admin/assets/tpl/widgets/custom/post-ideas.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/custom/time.hbs b/core/admin/assets/tpl/widgets/custom/time.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/custom/time.hbs
rename to core/admin/assets/tpl/widgets/custom/time.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/custom/tweets.hbs b/core/admin/assets/tpl/widgets/custom/tweets.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/custom/tweets.hbs
rename to core/admin/assets/tpl/widgets/custom/tweets.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/custom/upcoming-posts.hbs b/core/admin/assets/tpl/widgets/custom/upcoming-posts.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/custom/upcoming-posts.hbs
rename to core/admin/assets/tpl/widgets/custom/upcoming-posts.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/default/blank.hbs b/core/admin/assets/tpl/widgets/default/blank.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/default/blank.hbs
rename to core/admin/assets/tpl/widgets/default/blank.hbs
diff --git a/core/admin/assets/tmpl/content/widgets/default/number.hbs b/core/admin/assets/tpl/widgets/default/number.hbs
similarity index 100%
rename from core/admin/assets/tmpl/content/widgets/default/number.hbs
rename to core/admin/assets/tpl/widgets/default/number.hbs
diff --git a/core/admin/views/default.hbs b/core/admin/views/default.hbs
index 03c7954a71..db6960f1ad 100644
--- a/core/admin/views/default.hbs
+++ b/core/admin/views/default.hbs
@@ -48,7 +48,7 @@
         <script src="/core/admin/assets/lib/packery.pkgd.min.js"></script>
 
         <script src="/core/admin/assets/js/init.js"></script>
-        <script src="/core/admin/assets/tmpl/hbs-tmpl.js"></script>
+        <script src="/core/admin/assets/tpl/hbs-tpl.js"></script>
         <script src="/core/admin/assets/js/toggle.js"></script>
         <script src="/core/admin/assets/js/admin-ui-temp.js"></script>
         <script src="/core/admin/assets/js/markdown-actions.js"></script>