diff --git a/core/client/components/activating-list-item.js b/core/client/components/gh-activating-list-item.js
similarity index 100%
rename from core/client/components/activating-list-item.js
rename to core/client/components/gh-activating-list-item.js
diff --git a/core/client/components/blur-text-field.js b/core/client/components/gh-blur-text-field.js
similarity index 100%
rename from core/client/components/blur-text-field.js
rename to core/client/components/gh-blur-text-field.js
diff --git a/core/client/components/-codemirror.js b/core/client/components/gh-codemirror.js
similarity index 98%
rename from core/client/components/-codemirror.js
rename to core/client/components/gh-codemirror.js
index 5004559220..04919ce335 100644
--- a/core/client/components/-codemirror.js
+++ b/core/client/components/gh-codemirror.js
@@ -41,4 +41,4 @@ var Codemirror = Ember.TextArea.extend({
     }.on('willDestroyElement')
 });
 
-export default Codemirror;
\ No newline at end of file
+export default Codemirror;
diff --git a/core/client/components/file-upload.js b/core/client/components/gh-file-upload.js
similarity index 100%
rename from core/client/components/file-upload.js
rename to core/client/components/gh-file-upload.js
diff --git a/core/client/components/-markdown.js b/core/client/components/gh-markdown.js
similarity index 100%
rename from core/client/components/-markdown.js
rename to core/client/components/gh-markdown.js
diff --git a/core/client/components/modal-dialog.js b/core/client/components/gh-modal-dialog.js
similarity index 100%
rename from core/client/components/modal-dialog.js
rename to core/client/components/gh-modal-dialog.js
diff --git a/core/client/components/ghost-notification.js b/core/client/components/gh-notification.js
similarity index 100%
rename from core/client/components/ghost-notification.js
rename to core/client/components/gh-notification.js
diff --git a/core/client/components/ghost-notifications.js b/core/client/components/gh-notifications.js
similarity index 100%
rename from core/client/components/ghost-notifications.js
rename to core/client/components/gh-notifications.js
diff --git a/core/client/components/ghost-popover.js b/core/client/components/gh-popover.js
similarity index 81%
rename from core/client/components/ghost-popover.js
rename to core/client/components/gh-popover.js
index fb2fd579d7..f586f0ede3 100644
--- a/core/client/components/ghost-popover.js
+++ b/core/client/components/gh-popover.js
@@ -5,4 +5,4 @@ var GhostPopover = Ember.Component.extend({
     open: false
 });
 
-export default GhostPopover;
\ No newline at end of file
+export default GhostPopover;
diff --git a/core/client/components/upload-modal.js b/core/client/components/gh-upload-modal.js
similarity index 87%
rename from core/client/components/upload-modal.js
rename to core/client/components/gh-upload-modal.js
index 9a11a63ed6..a93a85507d 100644
--- a/core/client/components/upload-modal.js
+++ b/core/client/components/gh-upload-modal.js
@@ -1,9 +1,9 @@
 /*global console */
 
-import ModalDialog from 'ghost/components/modal-dialog';
+import ModalDialog from 'ghost/components/gh-modal-dialog';
 
 var UploadModal = ModalDialog.extend({
-    layoutName: 'components/modal-dialog',
+    layoutName: 'components/gh-modal-dialog',
 
     didInsertElement: function () {
         this._super();
diff --git a/core/client/helpers/count-words.js b/core/client/helpers/gh-count-words.js
similarity index 100%
rename from core/client/helpers/count-words.js
rename to core/client/helpers/gh-count-words.js
diff --git a/core/client/helpers/format-markdown.js b/core/client/helpers/gh-format-markdown.js
similarity index 100%
rename from core/client/helpers/format-markdown.js
rename to core/client/helpers/gh-format-markdown.js
diff --git a/core/client/helpers/format-timeago.js b/core/client/helpers/gh-format-timeago.js
similarity index 100%
rename from core/client/helpers/format-timeago.js
rename to core/client/helpers/gh-format-timeago.js
diff --git a/core/client/templates/-navbar.hbs b/core/client/templates/-navbar.hbs
index 7a8a746600..030e839e17 100644
--- a/core/client/templates/-navbar.hbs
+++ b/core/client/templates/-navbar.hbs
@@ -4,9 +4,9 @@
     </a>
     <nav id="global-nav" role="navigation">
         <ul id="main-menu" >
-            {{activating-list-item route="posts" title="Content" classNames="content"}}
-            {{activating-list-item route="new" title="New post" classNames="editor"}}
-            {{activating-list-item route="settings" title="Settings" classNames="settings"}}
+            {{gh-activating-list-item route="posts" title="Content" classNames="content"}}
+            {{gh-activating-list-item route="new" title="New post" classNames="editor"}}
+            {{gh-activating-list-item route="settings" title="Settings" classNames="settings"}}
 
             <li id="usermenu" class="usermenu subnav">
                 <a href="javascript:void(0);" {{action 'toggleMenu'}} class="dropdown">
@@ -18,7 +18,7 @@
                     <span class="name">{{user.name}}</span>
                 </a>
                 {{!-- @TODO: add functionality to allow for dropdown to work --}}
-                {{#ghost-popover open=showMenu}}
+                {{#gh-popover open=showMenu}}
                     <ul class="overlay">
                         <li class="usermenu-profile">{{#link-to 'settings.user'}}Your Profile{{/link-to}}</li>
                         <li class="divider"></li>
@@ -26,7 +26,7 @@
                         <li class="divider"></li>
                         <li class="usermenu-signout"><a href="#">Sign Out</a></li>
                     </ul>
-                {{/ghost-popover}}
+                {{/gh-popover}}
             </li>
         </ul>
     </nav>
diff --git a/core/client/templates/application.hbs b/core/client/templates/application.hbs
index fb2271cfa1..3605373249 100644
--- a/core/client/templates/application.hbs
+++ b/core/client/templates/application.hbs
@@ -3,8 +3,8 @@
 {{/unless}}
 
 <main role="main" id="main">
-    {{ghost-notifications}}
-    
+    {{gh-notifications}}
+
     {{outlet}}
 </main>
-{{outlet modal}}
\ No newline at end of file
+{{outlet modal}}
diff --git a/core/client/templates/components/activating-list-item.hbs b/core/client/templates/components/gh-activating-list-item.hbs
similarity index 100%
rename from core/client/templates/components/activating-list-item.hbs
rename to core/client/templates/components/gh-activating-list-item.hbs
diff --git a/core/client/templates/components/file-upload.hbs b/core/client/templates/components/gh-file-upload.hbs
similarity index 100%
rename from core/client/templates/components/file-upload.hbs
rename to core/client/templates/components/gh-file-upload.hbs
diff --git a/core/client/templates/components/-markdown.hbs b/core/client/templates/components/gh-markdown.hbs
similarity index 52%
rename from core/client/templates/components/-markdown.hbs
rename to core/client/templates/components/gh-markdown.hbs
index aa28b40937..94996e1284 100644
--- a/core/client/templates/components/-markdown.hbs
+++ b/core/client/templates/components/gh-markdown.hbs
@@ -1,3 +1,3 @@
 <div class="rendered-markdown">
-    {{format-markdown markdown}}
+    {{gh-format-markdown markdown}}
 </div>
diff --git a/core/client/templates/components/modal-dialog.hbs b/core/client/templates/components/gh-modal-dialog.hbs
similarity index 100%
rename from core/client/templates/components/modal-dialog.hbs
rename to core/client/templates/components/gh-modal-dialog.hbs
diff --git a/core/client/templates/components/ghost-notification.hbs b/core/client/templates/components/gh-notification.hbs
similarity index 100%
rename from core/client/templates/components/ghost-notification.hbs
rename to core/client/templates/components/gh-notification.hbs
diff --git a/core/client/templates/components/gh-notifications.hbs b/core/client/templates/components/gh-notifications.hbs
new file mode 100644
index 0000000000..779cade112
--- /dev/null
+++ b/core/client/templates/components/gh-notifications.hbs
@@ -0,0 +1,3 @@
+{{#each messages}}
+    {{gh-notification message=this}}
+{{/each}}
diff --git a/core/client/templates/components/ghost-notifications.hbs b/core/client/templates/components/ghost-notifications.hbs
deleted file mode 100644
index c69fd54f25..0000000000
--- a/core/client/templates/components/ghost-notifications.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#each messages}}
-    {{ghost-notification message=this}}
-{{/each}}
\ No newline at end of file
diff --git a/core/client/templates/debug.hbs b/core/client/templates/debug.hbs
index 016bc988e3..e2178eb714 100644
--- a/core/client/templates/debug.hbs
+++ b/core/client/templates/debug.hbs
@@ -28,7 +28,7 @@
                 <fieldset>
                     <div class="form-group">
                         <label>Import</label>
-                        {{file-upload onUpload="importData" uploadButtonText=uploadButtonText}}
+                        {{gh-file-upload onUpload="importData" uploadButtonText=uploadButtonText}}
                         <p>Import from another Ghost installation. If you import a user, this will replace the current user & log you out.</p>
                     </div>
                 </fieldset>
diff --git a/core/client/templates/editor.hbs b/core/client/templates/editor.hbs
index 35fe6c3523..1830bb204b 100644
--- a/core/client/templates/editor.hbs
+++ b/core/client/templates/editor.hbs
@@ -11,18 +11,18 @@
             <a class="markdown-help" href="" {{action "openModal" "markdown"}}><span class="hidden">What is Markdown?</span></a>
         </header>
         <section id="entry-markdown-content" class="entry-markdown-content">
-            {{-codemirror value=markdown scrollPosition=view.scrollPosition}}
+            {{gh-codemirror value=markdown scrollPosition=view.scrollPosition}}
         </section>
     </section>
 
     <section class="entry-preview">
         <header class="floatingheader">
-            <small>Preview <span class="entry-word-count js-entry-word-count">{{count-words markdown}} words</span></small>
+            <small>Preview <span class="entry-word-count js-entry-word-count">{{gh-count-words markdown}} words</span></small>
         </header>
         <section class="entry-preview-content">
-            {{-markdown markdown=markdown scrollPosition=view.scrollPosition}}
+            {{gh-markdown markdown=markdown scrollPosition=view.scrollPosition}}
         </section>
     </section>
 </section>
 
-{{partial 'publish-bar'}}
\ No newline at end of file
+{{partial 'publish-bar'}}
diff --git a/core/client/templates/modals/delete-all.hbs b/core/client/templates/modals/delete-all.hbs
index 251fd644a2..f221dc5eac 100644
--- a/core/client/templates/modals/delete-all.hbs
+++ b/core/client/templates/modals/delete-all.hbs
@@ -1,6 +1,6 @@
-{{#modal-dialog action="closeModal" type="action" style="wide,centered" animation="fade"
+{{#gh-modal-dialog action="closeModal" type="action" style="wide,centered" animation="fade"
     title="Would you really like to delete all content from your blog?" confirm=confirm}}
 
     <p>This is permanent! No backups, no restores, no magic undo button. <br /> We warned you, ok?</p>
 
-{{/modal-dialog}}
+{{/gh-modal-dialog}}
diff --git a/core/client/templates/modals/delete-post.hbs b/core/client/templates/modals/delete-post.hbs
index 742aa76525..424f9758ce 100644
--- a/core/client/templates/modals/delete-post.hbs
+++ b/core/client/templates/modals/delete-post.hbs
@@ -1,6 +1,6 @@
-{{#modal-dialog action="closeModal" showClose=true type="action" style="wide,centered" animation="fade"
+{{#gh-modal-dialog action="closeModal" showClose=true type="action" style="wide,centered" animation="fade"
     title="Are you sure you want to delete this post?" confirm=confirm}}
 
     <p>This is permanent! No backups, no restores, no magic undo button. <br /> We warned you, ok?</p>
 
-{{/modal-dialog}}
+{{/gh-modal-dialog}}
diff --git a/core/client/templates/modals/markdown.hbs b/core/client/templates/modals/markdown.hbs
index 25479a6d1d..be52237eab 100644
--- a/core/client/templates/modals/markdown.hbs
+++ b/core/client/templates/modals/markdown.hbs
@@ -1,4 +1,4 @@
-{{#modal-dialog action="closeModal" showClose=true style="wide" animation="fade"
+{{#gh-modal-dialog action="closeModal" showClose=true style="wide" animation="fade"
     title="Markdown Help"}}
     <section class="markdown-help-container">
         <table class="modal-markdown-help-table">
@@ -69,4 +69,4 @@
         </table>
         For further Markdown syntax reference: <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown Documentation</a>
     </section>
-{{/modal-dialog}}
+{{/gh-modal-dialog}}
diff --git a/core/client/templates/modals/upload.hbs b/core/client/templates/modals/upload.hbs
index cfac1c7711..e1e3d23076 100644
--- a/core/client/templates/modals/upload.hbs
+++ b/core/client/templates/modals/upload.hbs
@@ -1,4 +1,4 @@
-{{#upload-modal action="closeModal" close=true type="action" style="wide"
+{{#gh-upload-modal action="closeModal" close=true type="action" style="wide"
    animation="fade"}}
 
   <section class="js-drop-zone">
@@ -6,4 +6,4 @@
       <input data-url="upload" class="js-fileupload main" type="file" name="uploadimage" {{#if options.acceptEncoding}}accept="{{options.acceptEncoding}}"{{/if}}>
   </section>
 
-{{/upload-modal}}
+{{/gh-upload-modal}}
diff --git a/core/client/templates/post-settings-menu.hbs b/core/client/templates/post-settings-menu.hbs
index 8fb62d243e..83d04fc5fb 100644
--- a/core/client/templates/post-settings-menu.hbs
+++ b/core/client/templates/post-settings-menu.hbs
@@ -6,7 +6,7 @@
                     <label for="url">URL</label>
                 </td>
                 <td class="post-setting-field">
-                    {{blur-text-field class="post-setting-slug" id="url" value=newSlug action="updateSlug" placeholder=slugPlaceholder selectOnClick="true"}}
+                    {{gh-blur-text-field class="post-setting-slug" id="url" value=newSlug action="updateSlug" placeholder=slugPlaceholder selectOnClick="true"}}
                 </td>
             </tr>
             <tr class="post-setting">
@@ -14,7 +14,7 @@
                     <label for="pub-date">Pub Date</label>
                 </td>
                 <td class="post-setting-field">
-                    {{blur-text-field class="post-setting-date" value=view.publishedAt action="updatePublishedAt" placeholder=view.datePlaceholder}}
+                    {{gh-blur-text-field class="post-setting-date" value=view.publishedAt action="updatePublishedAt" placeholder=view.datePlaceholder}}
                 </td>
             </tr>
             <tr class="post-setting">
diff --git a/core/client/templates/posts.hbs b/core/client/templates/posts.hbs
index e9311c47ac..7d4a488271 100644
--- a/core/client/templates/posts.hbs
+++ b/core/client/templates/posts.hbs
@@ -19,7 +19,7 @@
                                             <span class="page">Page</span>
                                     {{else}}
                                         <time datetime="{{unbound published_at}}" class="date published">
-                                            Published {{format-timeago published_at}}
+                                            Published {{gh-format-timeago published_at}}
                                         </time>
                                     {{/if}}
                                 {{else}}
diff --git a/core/client/templates/posts/post.hbs b/core/client/templates/posts/post.hbs
index e3f205f574..25ff285a60 100644
--- a/core/client/templates/posts/post.hbs
+++ b/core/client/templates/posts/post.hbs
@@ -5,7 +5,7 @@
   <section class="content-preview-content">
       <div class="wrapper">
           <h1>{{title}}</h1>
-          {{format-markdown markdown}}
+          {{gh-format-markdown markdown}}
       </div>
   </section>
 
diff --git a/core/client/templates/settings/general.hbs b/core/client/templates/settings/general.hbs
index e54b994b50..ef7d77d31d 100644
--- a/core/client/templates/settings/general.hbs
+++ b/core/client/templates/settings/general.hbs
@@ -21,7 +21,7 @@
                 {{textarea id="blog-description" value=description}}
                 <p>
                     Describe what your blog is about
-                    <span class="word-count">{{count-words description}}</span>
+                    <span class="word-count">{{gh-count-words description}}</span>
                 </p>
 
             </div>
diff --git a/core/client/templates/settings/user.hbs b/core/client/templates/settings/user.hbs
index a11614ce77..f51b4f7c04 100644
--- a/core/client/templates/settings/user.hbs
+++ b/core/client/templates/settings/user.hbs
@@ -56,7 +56,7 @@
                 {{textarea id="user-bio" value=user.bio}}
                 <p>
                     Write about you, in 200 characters or less.
-                    <span class="word-count">{{count-words user.bio}}</span>
+                    <span class="word-count">{{gh-count-words user.bio}}</span>
                 </p>
             </div>