diff --git a/assets/scripts/app/controllers/repos.coffee b/assets/scripts/app/controllers/repos.coffee
index 7df3d16b..c9583a13 100644
--- a/assets/scripts/app/controllers/repos.coffee
+++ b/assets/scripts/app/controllers/repos.coffee
@@ -75,7 +75,7 @@ Travis.ReposController = Ember.ArrayController.extend
   searchFor: (phrase) ->
     Ember.run.cancel(@searchLater) if @searchLater
     @searchLater = Ember.run.later(this, (->
-      @transitionTo('index.search', phrase)
+      @transitionTo('main.search', phrase)
     ), 500)
 
   noReposMessage: (->
diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index 470b7637..6d224156 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -57,16 +57,16 @@ Travis.ApplicationRoute = Travis.Route.extend
         @auth.set('afterSignInTransition', null)
         transition.retry()
       else
-        @transitionTo('index')
+        @transitionTo('main')
 
     afterSignOut: ->
       if Travis.config.pro
         @transitionTo('auth')
       else
-        @transitionTo('index')
+        @transitionTo('main')
 
 Travis.Router.map ->
-  @resource 'index', path: '/', ->
+  @resource 'main', path: '/', ->
     @resource 'getting_started'
     @route 'recent'
     @route 'repositories'
@@ -170,7 +170,7 @@ Travis.InsufficientOauthPermissionsRoute = Travis.SimpleLayoutRoute.extend
     existingUser = document.location.hash.match(/#existing[_-]user/)
     controller.set('existingUser', existingUser)
 
-Travis.IndexTabRoute = Travis.Route.extend
+Travis.MainTabRoute = Travis.Route.extend
   renderTemplate: ->
     @render 'repo'
     @render 'build', into: 'repo'
@@ -195,20 +195,20 @@ Travis.IndexTabRoute = Travis.Route.extend
     redirectToGettingStarted: ->
       @transitionTo('getting_started')
 
-Travis.IndexMyRepositoriesRoute = Travis.Route.extend
+Travis.MainMyRepositoriesRoute = Travis.Route.extend
   redirect: ->
-    @transitionTo("index.repositories")
+    @transitionTo("main.repositories")
 
-Travis.IndexRepositoriesRoute = Travis.IndexTabRoute.extend
+Travis.MainRepositoriesRoute = Travis.MainTabRoute.extend
   needsAuth: true
   reposTabName: 'owned'
   afterModel: ->
     @controllerFor('repos').possiblyRedirectToGettingStartedPage()
 
-Travis.IndexRecentRoute = Travis.IndexTabRoute.extend
+Travis.MainRecentRoute = Travis.MainTabRoute.extend
   reposTabName: 'recent'
 
-Travis.IndexSearchRoute = Travis.IndexTabRoute.extend
+Travis.MainSearchRoute = Travis.MainTabRoute.extend
   renderTemplate: ->
     @render 'repo'
     @render 'build', into: 'repo'
@@ -329,7 +329,7 @@ Travis.RepoIndexRoute = Travis.Route.extend
 
 Travis.RepoRoute = Travis.Route.extend
   renderTemplate: ->
-    @render 'repo'
+    @render 'repo', into: 'main'
 
   setupController: (controller, model) ->
     # TODO: if repo is just a data hash with id and slug load it
@@ -352,28 +352,26 @@ Travis.RepoRoute = Travis.Route.extend
   actions:
     error: (error) ->
       # if error throwed has a slug (ie. it was probably repo not found)
-      # set the slug on index.error controller to allow to properly
+      # set the slug on main.error controller to allow to properly
       # display the repo information
       if error.slug
-        this.controllerFor('index.error').set('slug', error.slug)
+        this.controllerFor('main.error').set('slug', error.slug)
 
       # bubble to the top
       return true
 
-# Obviously Index route should be renamed to something
-# like "main" or "home"
-Travis.IndexIndexRoute = Travis.Route.extend
+Travis.MainIndexRoute = Travis.Route.extend
   redirect: ->
     target = if @signedIn() then 'repositories' else 'recent'
-    @transitionTo("index.#{target}")
+    @transitionTo("main.#{target}")
 
-Travis.IndexRoute = Travis.Route.extend
+Travis.MainRoute = Travis.Route.extend
   renderTemplate: ->
     $('body').attr('id', 'home')
 
     @_super.apply this, arguments
 
-    @render 'repos',   outlet: 'left', into: 'index'
+    @render 'repos',   outlet: 'left', into: 'main'
 
   setupController: (controller)->
     # TODO: this is redundant with repositories and recent routes
diff --git a/assets/scripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs
index 28daa0ba..6f55da24 100644
--- a/assets/scripts/app/templates/layouts/top.hbs
+++ b/assets/scripts/app/templates/layouts/top.hbs
@@ -1,4 +1,4 @@
-{{#link-to "index"}}
+{{#link-to "main"}}
   <div id="home">
     <h1>Travis</h1>
   </div>
@@ -6,7 +6,7 @@
 
 <ul id="navigation">
   <li class="home">
-    {{#link-to "index"}}Home{{/link-to}}
+    {{#link-to "main"}}Home{{/link-to}}
   </li>
   <li>
     <a href="http://blog.travis-ci.com">Blog</a>
diff --git a/assets/scripts/app/templates/index.hbs b/assets/scripts/app/templates/main.hbs
similarity index 100%
rename from assets/scripts/app/templates/index.hbs
rename to assets/scripts/app/templates/main.hbs
diff --git a/assets/scripts/app/templates/index/error.hbs b/assets/scripts/app/templates/main/error.hbs
similarity index 100%
rename from assets/scripts/app/templates/index/error.hbs
rename to assets/scripts/app/templates/main/error.hbs
diff --git a/assets/scripts/app/templates/index/loading.hbs b/assets/scripts/app/templates/main/loading.hbs
similarity index 100%
rename from assets/scripts/app/templates/index/loading.hbs
rename to assets/scripts/app/templates/main/loading.hbs
diff --git a/assets/scripts/app/templates/repos/list/tabs.hbs b/assets/scripts/app/templates/repos/list/tabs.hbs
index a0648119..3b45ab47 100644
--- a/assets/scripts/app/templates/repos/list/tabs.hbs
+++ b/assets/scripts/app/templates/repos/list/tabs.hbs
@@ -1,11 +1,11 @@
 <ul class="tabs">
   <li id="tab_owned" {{bind-attr class="view.classOwned"}}>
-    <h5>{{#link-to "index.repositories"}}My Repositories{{/link-to}}</h5>
+    <h5>{{#link-to "main.repositories"}}My Repositories{{/link-to}}</h5>
   </li>
 
   {{#unless config.pro}}
     <li id="tab_recent" {{bind-attr class="view.classRecent"}}>
-      <h5>{{#link-to "index.recent"}}Recent{{/link-to}}</h5>
+      <h5>{{#link-to "main.recent"}}Recent{{/link-to}}</h5>
     </li>
   {{/unless}}
 
diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee
index 036c8c7a..ea0aa8b9 100644
--- a/assets/scripts/app/views.coffee
+++ b/assets/scripts/app/views.coffee
@@ -28,7 +28,7 @@ Travis.NotFoundView = Ember.View.extend
 
       $('.popup').removeClass('display')
 
-Travis.IndexView = Travis.View.extend
+Travis.MainView = Travis.View.extend
   layoutName: 'layouts/home'
   classNames: ['application']