diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee
index ecaddf41..1d92508b 100644
--- a/assets/scripts/app/controllers.coffee
+++ b/assets/scripts/app/controllers.coffee
@@ -10,20 +10,20 @@ require 'controllers/profile'
 require 'controllers/repos'
 require 'controllers/repo'
 require 'controllers/settings'
-require 'controllers/current_user'
+require 'controllers/current-user'
 require 'controllers/request'
 require 'controllers/requests'
 require 'controllers/caches'
-require 'controllers/env_var'
-require 'controllers/env_vars'
-require 'controllers/env_var_new'
-require 'controllers/ssh_key'
+require 'controllers/env-var'
+require 'controllers/env-vars'
+require 'controllers/env-var-new'
+require 'controllers/ssh-key'
 require 'controllers/sidebar'
 require 'controllers/top'
-require 'controllers/first_sync'
+require 'controllers/first-sync'
 require 'controllers/accounts/info'
 require 'controllers/main/error'
 require 'controllers/builds/item'
 require 'controllers/queue'
-require 'controllers/running_jobs'
+require 'controllers/running-jobs'
 require 'controllers/dashboard/repositories'
diff --git a/assets/scripts/app/controllers/repos.coffee b/assets/scripts/app/controllers/repos.coffee
index 7efaae2d..c9d70a7c 100644
--- a/assets/scripts/app/controllers/repos.coffee
+++ b/assets/scripts/app/controllers/repos.coffee
@@ -1,4 +1,4 @@
-require 'travis/limited_array'
+require 'travis/limited-array'
 
 Repo = Travis.Repo
 limit = Ember.computed.limit
diff --git a/assets/scripts/app/helpers.coffee b/assets/scripts/app/helpers.coffee
index 0a6b6e41..04b0b2c3 100644
--- a/assets/scripts/app/helpers.coffee
+++ b/assets/scripts/app/helpers.coffee
@@ -1,8 +1,8 @@
 require 'helpers/handlebars'
 require 'helpers/helpers'
 require 'helpers/urls'
-require 'helpers/status_image_formats'
-require 'helpers/github_url_properties'
+require 'helpers/status-image-formats'
+require 'helpers/github-url-properties'
 
 Travis.Handlebars = {}
 
@@ -14,14 +14,14 @@ require 'helpers/travis-field'
 require 'helpers/travis-field'
 require 'helpers/filter-input'
 require 'helpers/capitalize'
-require 'helpers/github_commit_link'
-require 'helpers/format_time'
-require 'helpers/format_duration'
-require 'helpers/format_commit'
-require 'helpers/format_sha'
-require 'helpers/format_message'
-require 'helpers/format_config'
-require 'helpers/short_compare_shas'
+require 'helpers/github-commit-link'
+require 'helpers/format-time'
+require 'helpers/format-duration'
+require 'helpers/format-commit'
+require 'helpers/format-sha'
+require 'helpers/format-message'
+require 'helpers/format-config'
+require 'helpers/short-compare-shas'
 require 'helpers/mb'
 
 Ember.Handlebars.registerHelper('label', Travis.Handlebars.label)
diff --git a/assets/scripts/app/models.coffee b/assets/scripts/app/models.coffee
index 657f9ce4..a6726754 100644
--- a/assets/scripts/app/models.coffee
+++ b/assets/scripts/app/models.coffee
@@ -12,5 +12,5 @@ require 'models/annotation'
 require 'models/repo'
 require 'models/request'
 require 'models/user'
-require 'models/env_var'
-require 'models/ssh_key'
+require 'models/env-var'
+require 'models/ssh-key'
diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee
index a4a9e915..7381bbbe 100644
--- a/assets/scripts/app/models/build.coffee
+++ b/assets/scripts/app/models/build.coffee
@@ -1,6 +1,6 @@
 require 'travis/model'
 require 'models/extensions'
-require 'utils/duration_calculations'
+require 'utils/duration-calculations'
 require 'travis/ajax'
 
 compact = Travis.Helpers.compact
diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee
index e270bdce..97b0b713 100644
--- a/assets/scripts/app/models/log.coffee
+++ b/assets/scripts/app/models/log.coffee
@@ -1,4 +1,4 @@
-require 'travis/log_chunks'
+require 'travis/log-chunks'
 
 Ajax = Travis.ajax
 
diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee
index 9751743b..daf94eab 100644
--- a/assets/scripts/app/models/repo.coffee
+++ b/assets/scripts/app/models/repo.coffee
@@ -1,4 +1,4 @@
-require 'travis/expandable_record_array'
+require 'travis/expandable-record-array'
 require 'travis/model'
 require 'helpers/helpers'
 
diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index 1f1fcf79..1d40f510 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -47,7 +47,7 @@ Travis.Router.map ->
 
   @route 'notFound', path: "/*path"
 
-require 'routes/abstract_builds'
+require 'routes/abstract-builds'
 require 'routes/account'
 require 'routes/accounts/index'
 require 'routes/accounts/info'
@@ -58,21 +58,21 @@ require 'routes/branches'
 require 'routes/build'
 require 'routes/builds'
 require 'routes/caches'
-require 'routes/env_vars'
-require 'routes/first_sync'
-require 'routes/getting_started'
-require 'routes/insufficient_oauth_permissions'
+require 'routes/env-vars'
+require 'routes/first-sync'
+require 'routes/getting-started'
+require 'routes/insufficient-oauth-permissions'
 require 'routes/job'
 require 'routes/main/index'
-require 'routes/main/my_repositories'
+require 'routes/main/my-repositories'
 require 'routes/main/recent'
 require 'routes/main/repositories'
 require 'routes/main/search'
 require 'routes/main'
-require 'routes/main_tab'
-require 'routes/not_found'
+require 'routes/main-tab'
+require 'routes/not-found'
 require 'routes/profile'
-require 'routes/pull_requests'
+require 'routes/pull-requests'
 require 'routes/repo/index'
 require 'routes/repo'
 require 'routes/request'
@@ -80,7 +80,7 @@ require 'routes/requests'
 require 'routes/route'
 require 'routes/settings/index'
 require 'routes/settings'
-require 'routes/simple_layout'
-require 'routes/ssh_key'
+require 'routes/simple-layout'
+require 'routes/ssh-key'
 require 'routes/dashboard'
 require 'routes/dashboard/repositories'
diff --git a/assets/scripts/app/routes/first-sync.coffee b/assets/scripts/app/routes/first-sync.coffee
index 466dbea3..7a1071f7 100644
--- a/assets/scripts/app/routes/first-sync.coffee
+++ b/assets/scripts/app/routes/first-sync.coffee
@@ -1,5 +1,5 @@
 require 'routes/route'
-require 'routes/simple_layout'
+require 'routes/simple-layout'
 require 'models/repo'
 
 SimpleLayoutRoute = Travis.SimpleLayoutRoute
diff --git a/assets/scripts/app/routes/insufficient-oauth-permissions.coffee b/assets/scripts/app/routes/insufficient-oauth-permissions.coffee
index 282174d2..a1338f23 100644
--- a/assets/scripts/app/routes/insufficient-oauth-permissions.coffee
+++ b/assets/scripts/app/routes/insufficient-oauth-permissions.coffee
@@ -1,5 +1,5 @@
 require 'routes/route'
-require 'routes/simple_layout'
+require 'routes/simple-layout'
 
 SimpleLayoutRoute = Travis.SimpleLayoutRoute
 
diff --git a/assets/scripts/app/routes/main/recent.coffee b/assets/scripts/app/routes/main/recent.coffee
index eb87a416..3a8fe7f6 100644
--- a/assets/scripts/app/routes/main/recent.coffee
+++ b/assets/scripts/app/routes/main/recent.coffee
@@ -1,5 +1,5 @@
 require 'routes/route'
-require 'routes/main_tab'
+require 'routes/main-tab'
 
 MainTabRoute = Travis.MainTabRoute
 
diff --git a/assets/scripts/app/routes/main/repositories.coffee b/assets/scripts/app/routes/main/repositories.coffee
index 1f43e052..20d90a3f 100644
--- a/assets/scripts/app/routes/main/repositories.coffee
+++ b/assets/scripts/app/routes/main/repositories.coffee
@@ -1,5 +1,5 @@
 require 'routes/route'
-require 'routes/main_tab'
+require 'routes/main-tab'
 
 MainTabRoute = Travis.MainTabRoute
 
diff --git a/assets/scripts/app/routes/main/search.coffee b/assets/scripts/app/routes/main/search.coffee
index 590e9b93..0daf6298 100644
--- a/assets/scripts/app/routes/main/search.coffee
+++ b/assets/scripts/app/routes/main/search.coffee
@@ -1,5 +1,5 @@
 require 'routes/route'
-require 'routes/main_tab'
+require 'routes/main-tab'
 
 MainTabRoute = Travis.MainTabRoute
 
diff --git a/assets/scripts/app/routes/ssh-key.coffee b/assets/scripts/app/routes/ssh-key.coffee
index 782541c9..2d3fa61e 100644
--- a/assets/scripts/app/routes/ssh-key.coffee
+++ b/assets/scripts/app/routes/ssh-key.coffee
@@ -1,5 +1,5 @@
 require 'routes/route'
-require 'models/ssh_key'
+require 'models/ssh-key'
 require 'travis/ajax'
 
 SshKey = Travis.SshKey
diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee
index cdf5c1dd..f929e795 100644
--- a/assets/scripts/app/views.coffee
+++ b/assets/scripts/app/views.coffee
@@ -20,14 +20,14 @@ require 'views/profile'
 require 'views/stats'
 require 'views/signin'
 require 'views/top'
-require 'views/status_images'
-require 'views/status_image_input'
+require 'views/status-images'
+require 'views/status-image-input'
 require 'views/dashboard'
 require 'views/show-more-button'
 require 'views/main'
-require 'views/not_found'
+require 'views/not-found'
 require 'views/auth/signin'
-require 'views/insufficient_oauth_permissions'
-require 'views/first_sync'
+require 'views/insufficient-oauth-permissions'
+require 'views/first-sync'
 require 'views/application/loading'
 require 'views/dashboard/loading'
diff --git a/assets/scripts/app/views/log.coffee b/assets/scripts/app/views/log.coffee
index 7e0b1b61..00a127fa 100644
--- a/assets/scripts/app/views/log.coffee
+++ b/assets/scripts/app/views/log.coffee
@@ -1,6 +1,6 @@
 require 'log'
-require 'travis/lines_selector'
-require 'travis/log_folder'
+require 'travis/lines-selector'
+require 'travis/log-folder'
 
 Log.DEBUG = false
 Log.LIMIT = 10000
diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee
index c38ef10e..6bf31cf0 100644
--- a/assets/scripts/travis.coffee
+++ b/assets/scripts/travis.coffee
@@ -219,14 +219,14 @@ require 'serializers/job'
 require 'serializers/build'
 require 'serializers/account'
 require 'serializers/request'
-require 'serializers/env_var'
-require 'adapters/env_var'
-require 'adapters/ssh_key'
+require 'serializers/env-var'
+require 'adapters/env-var'
+require 'adapters/ssh-key'
 require 'transforms/object'
 require 'store'
 #require 'travis/adapter'
-#require 'travis/adapters/env_vars'
-#require 'travis/adapters/ssh_key'
+#require 'travis/adapters/env-vars'
+#require 'travis/adapters/ssh-key'
 require 'routes'
 require 'auth'
 require 'controllers'