diff --git a/assets/scripts/app/controllers/job.coffee b/assets/scripts/app/controllers/job.coffee
index 5705e0d6..db9f61f2 100644
--- a/assets/scripts/app/controllers/job.coffee
+++ b/assets/scripts/app/controllers/job.coffee
@@ -1,4 +1,6 @@
-Travis.JobController = Em.Controller.extend
+githubCommit = Travis.Urls.githubCommit
+
+Controller = Ember.Controller.extend
   needs: ['repo']
 
   repoBinding: 'controllers.repo.repo'
@@ -10,5 +12,7 @@ Travis.JobController = Em.Controller.extend
   currentItemBinding: 'job'
 
   urlGithubCommit: (->
-    Travis.Urls.githubCommit(@get('repo.slug'), @get('commit.sha'))
+    githubCommit(@get('repo.slug'), @get('commit.sha'))
   ).property('repo.slug', 'commit.sha')
+
+Travis.JobController = Controller
diff --git a/assets/scripts/app/controllers/repos.coffee b/assets/scripts/app/controllers/repos.coffee
index b53f16c9..7efaae2d 100644
--- a/assets/scripts/app/controllers/repos.coffee
+++ b/assets/scripts/app/controllers/repos.coffee
@@ -1,8 +1,9 @@
 require 'travis/limited_array'
 
 Repo = Travis.Repo
+limit = Ember.computed.limit
 
-Travis.ReposController = Ember.ArrayController.extend
+Controller = Ember.ArrayController.extend
   actions:
     activate: (name) ->
       @activate(name)
@@ -36,7 +37,7 @@ Travis.ReposController = Ember.ArrayController.extend
       isLoadedBinding: 'repos.isLoaded'
       repos: Repo.withLastBuild(@store)
       sorted: Ember.computed.sort('repos', 'sortedReposKeys')
-      content: Ember.computed.limit('sorted', 'limit')
+      content: limit('sorted', 'limit')
       sortedReposKeys: ['sortOrder:asc']
       limit: 30
     ).create()
@@ -90,3 +91,5 @@ Travis.ReposController = Ember.ArrayController.extend
    else
     'Could not find any repos'
   ).property('tab')
+
+Travis.ReposController = Controller
diff --git a/assets/scripts/app/controllers/request.coffee b/assets/scripts/app/controllers/request.coffee
index 2a75ebc1..29caaa35 100644
--- a/assets/scripts/app/controllers/request.coffee
+++ b/assets/scripts/app/controllers/request.coffee
@@ -1,4 +1,4 @@
-Travis.RequestController = Ember.ObjectController.extend
+Controller = Ember.ObjectController.extend
   requestClass: (->
     if @get('content.isAccepted')
       'accepted'
@@ -28,4 +28,4 @@ Travis.RequestController = Ember.ObjectController.extend
       message
   ).property('model.message')
 
-
+Travis.RequestController = Controller
diff --git a/assets/scripts/app/helpers/format_commit.coffee b/assets/scripts/app/helpers/format-commit.coffee
similarity index 100%
rename from assets/scripts/app/helpers/format_commit.coffee
rename to assets/scripts/app/helpers/format-commit.coffee
diff --git a/assets/scripts/app/helpers/format_config.coffee b/assets/scripts/app/helpers/format-config.coffee
similarity index 100%
rename from assets/scripts/app/helpers/format_config.coffee
rename to assets/scripts/app/helpers/format-config.coffee
diff --git a/assets/scripts/app/helpers/format_duration.coffee b/assets/scripts/app/helpers/format-duration.coffee
similarity index 100%
rename from assets/scripts/app/helpers/format_duration.coffee
rename to assets/scripts/app/helpers/format-duration.coffee
diff --git a/assets/scripts/app/helpers/format_message.coffee b/assets/scripts/app/helpers/format-message.coffee
similarity index 100%
rename from assets/scripts/app/helpers/format_message.coffee
rename to assets/scripts/app/helpers/format-message.coffee
diff --git a/assets/scripts/app/helpers/format_sha.coffee b/assets/scripts/app/helpers/format-sha.coffee
similarity index 100%
rename from assets/scripts/app/helpers/format_sha.coffee
rename to assets/scripts/app/helpers/format-sha.coffee
diff --git a/assets/scripts/app/helpers/format_time.coffee b/assets/scripts/app/helpers/format-time.coffee
similarity index 100%
rename from assets/scripts/app/helpers/format_time.coffee
rename to assets/scripts/app/helpers/format-time.coffee
diff --git a/assets/scripts/app/helpers/github_commit_link.coffee b/assets/scripts/app/helpers/github-commit-link.coffee
similarity index 100%
rename from assets/scripts/app/helpers/github_commit_link.coffee
rename to assets/scripts/app/helpers/github-commit-link.coffee
diff --git a/assets/scripts/app/helpers/github_url_properties.coffee b/assets/scripts/app/helpers/github-url-properties.coffee
similarity index 100%
rename from assets/scripts/app/helpers/github_url_properties.coffee
rename to assets/scripts/app/helpers/github-url-properties.coffee
diff --git a/assets/scripts/app/helpers/short_compare_shas.coffee b/assets/scripts/app/helpers/short-compare-shas.coffee
similarity index 100%
rename from assets/scripts/app/helpers/short_compare_shas.coffee
rename to assets/scripts/app/helpers/short-compare-shas.coffee
diff --git a/assets/scripts/app/helpers/status_image_formats.coffee b/assets/scripts/app/helpers/status-image-formats.coffee
similarity index 100%
rename from assets/scripts/app/helpers/status_image_formats.coffee
rename to assets/scripts/app/helpers/status-image-formats.coffee