diff --git a/core/server/helpers/index.js b/core/server/helpers/index.js
index 3e57ecc089..11b96de8d9 100644
--- a/core/server/helpers/index.js
+++ b/core/server/helpers/index.js
@@ -106,9 +106,9 @@ coreHelpers = function (ghost) {
     ghost.registerThemeHelper('bodyclass', function (options) {
         var classes = [];
         if (!this.path || this.path === '/' || this.path === '') {
-            classes.push('home');
+            classes.push('home-template');
         } else {
-            classes.push('post');
+            classes.push('post-template');
         }
 
         return ghost.doFilter('bodyclass', classes, function (classes) {
diff --git a/core/test/unit/frontend_helpers_index_spec.js b/core/test/unit/frontend_helpers_index_spec.js
index 784e555f9a..c6e22e0a15 100644
--- a/core/test/unit/frontend_helpers_index_spec.js
+++ b/core/test/unit/frontend_helpers_index_spec.js
@@ -149,7 +149,7 @@ describe('Core Helpers', function () {
             var rendered = handlebars.helpers.bodyclass.call({});
             should.exist(rendered);
 
-            rendered.string.should.equal('home');
+            rendered.string.should.equal('home-template');
         });
 
         it('can render class string for context', function () {
@@ -159,8 +159,8 @@ describe('Core Helpers', function () {
             should.exist(rendered1);
             should.exist(rendered2);
 
-            rendered1.string.should.equal('home');
-            rendered2.string.should.equal('post');
+            rendered1.string.should.equal('home-template');
+            rendered2.string.should.equal('post-template');
         });
     });