diff --git a/assets/scripts/app/helpers.coffee b/assets/scripts/app/helpers.coffee
index efc63b17..0a6b6e41 100644
--- a/assets/scripts/app/helpers.coffee
+++ b/assets/scripts/app/helpers.coffee
@@ -32,14 +32,14 @@ Ember.Handlebars.registerHelper('travis-field', Travis.Handlebars.travisField)
 Ember.Handlebars.registerHelper('filter-input', Travis.Handlebars.filterInput)
 
 Ember.Handlebars.registerBoundHelper('capitalize', Travis.Handlebars.capitalize)
-Ember.Handlebars.registerBoundHelper('githubCommitLink', Travis.Handlebars.githubCommitLink)
-Ember.Handlebars.registerBoundHelper('formatTime', Travis.Handlebars.formatTime)
-Ember.Handlebars.registerBoundHelper('formatDuration', Travis.Handlebars.formatDuration)
-Ember.Handlebars.registerBoundHelper('formatCommit', Travis.Handlebars.formatCommit, 'sha', 'branch')
-Ember.Handlebars.registerBoundHelper('formatSha', Travis.Handlebars.formatSha)
-Ember.Handlebars.registerBoundHelper('formatMessage', Travis.Handlebars.formatMessage)
-Ember.Handlebars.registerBoundHelper('formatConfig', Travis.Handlebars.formatConfig)
-Ember.Handlebars.registerBoundHelper('shortCompareShas', Travis.Handlebars.shortCompareShas)
+Ember.Handlebars.registerBoundHelper('github-commit-link', Travis.Handlebars.githubCommitLink)
+Ember.Handlebars.registerBoundHelper('format-time', Travis.Handlebars.formatTime)
+Ember.Handlebars.registerBoundHelper('format-duration', Travis.Handlebars.formatDuration)
+Ember.Handlebars.registerBoundHelper('format-commit', Travis.Handlebars.formatCommit, 'sha', 'branch')
+Ember.Handlebars.registerBoundHelper('format-sha', Travis.Handlebars.formatSha)
+Ember.Handlebars.registerBoundHelper('format-message', Travis.Handlebars.formatMessage)
+Ember.Handlebars.registerBoundHelper('format-config', Travis.Handlebars.formatConfig)
+Ember.Handlebars.registerBoundHelper('short-compare-shas', Travis.Handlebars.shortCompareShas)
 Ember.Handlebars.registerBoundHelper('mb', Travis.Handlebars.mb)
 
 Ember.LinkView.reopen
diff --git a/assets/scripts/app/templates/account.hbs b/assets/scripts/app/templates/account.hbs
index 37633139..54c9119e 100644
--- a/assets/scripts/app/templates/account.hbs
+++ b/assets/scripts/app/templates/account.hbs
@@ -20,7 +20,7 @@
     </p>
   {{else}}
     <p class="message">
-      Last synchronized from GitHub: {{formatTime user.syncedAt}}
+      Last synchronized from GitHub: {{format-time user.syncedAt}}
       <a class="sync_now button" {{action "sync"}}>
         Sync now
       </a>
diff --git a/assets/scripts/app/templates/build.hbs b/assets/scripts/app/templates/build.hbs
index ef6ef692..52b3b269 100644
--- a/assets/scripts/app/templates/build.hbs
+++ b/assets/scripts/app/templates/build.hbs
@@ -14,7 +14,7 @@
       </div>
 
       <div class="finished">
-        {{formatTime build.finishedAt}}
+        {{format-time build.finishedAt}}
       </div>
 
       {{#if build.tagName}}
@@ -24,14 +24,14 @@
       {{/if}}
 
       <div class="commit-changes">
-        <a class="commit" {{bind-attr href="urlGithubCommit"}}>Commit {{formatSha commit.sha}}</a>
+        <a class="commit" {{bind-attr href="urlGithubCommit"}}>Commit {{format-sha commit.sha}}</a>
       </div>
       <div class="commit-changes">
         {{#if build.pullRequest}}
           <a class="compare" {{bind-attr href="build.commit.compareUrl"}}>#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}</a>
         {{else}}
           {{#if build.commit.compareUrl}}
-            <a class="compare" {{bind-attr href="build.commit.compareUrl"}}>Compare {{shortCompareShas build.commit.compareUrl}}</a>
+            <a class="compare" {{bind-attr href="build.commit.compareUrl"}}>Compare {{short-compare-shas build.commit.compareUrl}}</a>
           {{/if}}
         {{/if}}
       </div>
@@ -43,11 +43,11 @@
       </div>
 
       <div class="subject">
-      - {{formatMessage build.commit.subject repoBinding=build.repo}}
+      - {{format-message build.commit.subject repoBinding=build.repo}}
       </div>
     </div>
 
-    <pre class="body">{{formatMessage build.commit.body repoBinding=build.repo pre=true}}</pre>
+    <pre class="body">{{format-message build.commit.body repoBinding=build.repo pre=true}}</pre>
 
     <div class="footer">
       <div class="author">
diff --git a/assets/scripts/app/templates/builds.hbs b/assets/scripts/app/templates/builds.hbs
index bac8dfb5..9aee7b62 100644
--- a/assets/scripts/app/templates/builds.hbs
+++ b/assets/scripts/app/templates/builds.hbs
@@ -32,11 +32,11 @@
             {{/if}}
           </td>
           <td class="message">
-            {{{formatMessage build.commit.message short="true" repoBinding=build.repo}}}
+            {{{format-message build.commit.message short="true" repoBinding=build.repo}}}
           </td>
           <td class="commit">
             <a {{bind-attr href="build.urlGithubCommit"}}>
-              {{formatCommit build.commit}}
+              {{format-commit build.commit}}
             </a>
           </td>
           <td class="committer">
@@ -53,7 +53,7 @@
             {{formatDuration build.duration}}
           </td>
           <td class="finished_at timeago" {{bind-attr title="build.formattedFinishedAt"}}>
-            {{formatTime build.finishedAt}}
+            {{format-time build.finishedAt}}
           </td>
         </tr>
       {{/each}}
diff --git a/assets/scripts/app/templates/dashboard.hbs b/assets/scripts/app/templates/dashboard.hbs
index e2147cab..c24cd689 100644
--- a/assets/scripts/app/templates/dashboard.hbs
+++ b/assets/scripts/app/templates/dashboard.hbs
@@ -1 +1 @@
-{{outlet}}
\ No newline at end of file
+{{outlet}}
diff --git a/assets/scripts/app/templates/dashboard/repositories.hbs b/assets/scripts/app/templates/dashboard/repositories.hbs
index edcb7e2c..0ba4449f 100644
--- a/assets/scripts/app/templates/dashboard/repositories.hbs
+++ b/assets/scripts/app/templates/dashboard/repositories.hbs
@@ -45,7 +45,7 @@
           <p class="org">{{repo.owner.login}}</p>
           <p class="repo">{{#link-to "repo" repo.owner.login repo.name}}{{repo.name}}{{/link-to}}</p>
           <div class="duration">{{formatDuration repo.last_build.duration}}</div>
-          <div class="finished">{{formatTime repo.last_build.finished_at}}</div>
+          <div class="finished">{{format-time repo.last_build.finished_at}}</div>
           <p class="build-status">
             {{#link-to "build" repo.owner.login repo.name repo.last_build.id}}
               #{{repo.last_build.number}} {{repo.last_build.state}}
diff --git a/assets/scripts/app/templates/events/list.hbs b/assets/scripts/app/templates/events/list.hbs
index bc29f881..9e13db94 100644
--- a/assets/scripts/app/templates/events/list.hbs
+++ b/assets/scripts/app/templates/events/list.hbs
@@ -13,7 +13,7 @@
       {{#each event in view.events}}
         {{#view Travis.EventsItemView contextBinding="event"}}
           <td class="created_at">
-            {{formatTime createdAt}}
+            {{format-time createdAt}}
           </td>
           <td class="event">
             {{event.event_}}
diff --git a/assets/scripts/app/templates/job.hbs b/assets/scripts/app/templates/job.hbs
index a0139070..5fd34a27 100644
--- a/assets/scripts/app/templates/job.hbs
+++ b/assets/scripts/app/templates/job.hbs
@@ -15,7 +15,7 @@
         </div>
 
         <div class="finished">
-          {{formatTime job.finishedAt}}
+          {{format-time job.finishedAt}}
         </div>
 
         {{#if job.tagName}}
@@ -25,14 +25,14 @@
         {{/if}}
 
         <div class="commit-changes">
-          <div class="text"><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha job.commit.sha}}</a></div>
+          <div class="text"><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{format-sha job.commit.sha}}</a></div>
         </div>
         <div class="commit-changes">
           {{#if job.build.pullRequest}}
             <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}}>#{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}</a></div>
           {{else}}
             {{#if job.build.commit.compareUrl}}
-              <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}}>Compare {{shortCompareShas job.build.commit.compareUrl}}</a></div>
+              <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}}>Compare {{short-compare-shas job.build.commit.compareUrl}}</a></div>
             {{/if}}
           {{/if}}
         </div>
@@ -43,10 +43,10 @@
       </div>
 
       <div class="subject">
-        - {{formatMessage job.commit.subject repoBinding=job.repo}}
+        - {{format-message job.commit.subject repoBinding=job.repo}}
       </div>
 
-      <pre class="body">{{formatMessage job.commit.body repoBinding=job.repo pre=true}}</pre>
+      <pre class="body">{{format-message job.commit.body repoBinding=job.repo pre=true}}</pre>
 
       <div class="footer">
         <div class="author">
diff --git a/assets/scripts/app/templates/jobs.hbs b/assets/scripts/app/templates/jobs.hbs
index c9aee3f9..c2c0374a 100644
--- a/assets/scripts/app/templates/jobs.hbs
+++ b/assets/scripts/app/templates/jobs.hbs
@@ -33,7 +33,7 @@
             {{formatDuration duration}}
           </td>
           <td class="finished_at timeago" {{bind-attr title="formattedFinishedAt"}}>
-            {{formatTime finishedAt}}
+            {{format-time finishedAt}}
           </td>
           {{#each value in configValues}}
             <td>{{value}}</td>
diff --git a/assets/scripts/app/templates/repos.hbs b/assets/scripts/app/templates/repos.hbs
index 574414ba..ebb9930f 100644
--- a/assets/scripts/app/templates/repos.hbs
+++ b/assets/scripts/app/templates/repos.hbs
@@ -31,7 +31,7 @@
         <p class="summary">
           <span class="finished-icon"></span><span class="finished_at_label">Finished:</span>
           <abbr class="finished_at timeago" {{bind-attr title="lastBuildFinishedAt"}}>
-            {{formatTime repo.lastBuildFinishedAt}}
+            {{format-time repo.lastBuildFinishedAt}}
           </abbr>
         </p>
         {{/if}}
diff --git a/assets/scripts/app/templates/request.hbs b/assets/scripts/app/templates/request.hbs
index 82264dcc..0f556e01 100644
--- a/assets/scripts/app/templates/request.hbs
+++ b/assets/scripts/app/templates/request.hbs
@@ -7,7 +7,7 @@
       <span class="pr-number" {{bind-attr title="pullRequestTitle"}}>#{{pullRequestNumber}}</span>
       pull request.
     {{else}}
-      This request is based on a commit {{formatCommit commit}} by {{commit.authorName}}
+      This request is based on a commit {{format-commit commit}} by {{commit.authorName}}
       pushed to
       {{#if branchName}}
         to <code>{{branchName}}</code>
diff --git a/assets/scripts/app/templates/requests.hbs b/assets/scripts/app/templates/requests.hbs
index 7ce6cfcb..5d9c7e9f 100644
--- a/assets/scripts/app/templates/requests.hbs
+++ b/assets/scripts/app/templates/requests.hbs
@@ -25,7 +25,7 @@
           <span class="status"></span>
           {{id}}
         </td>
-        <td>{{githubCommitLink repo.slug commit.sha}}</td>
+        <td>{{github-commit-link repo.slug commit.sha}}</td>
         <td>
           {{#if build}}
             {{#link-to "build" build}}#{{build.number}}{{/link-to}}
@@ -33,7 +33,7 @@
             -
           {{/if}}
         </td>
-        <td class="commit-message">{{{formatMessage commit.message short="true" repoBinding=build.repo}}}</td>
+        <td class="commit-message">{{{format-message commit.message short="true" repoBinding=build.repo}}}</td>
         <td>{{type}}</td>
         <td>{{message}}</td>
       </tr>