diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index c701cac7..00902735 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -21,16 +21,11 @@ class RolesController < ApplicationController
   before_filter :require_admin
 
   verify :method => :post, :only => [ :destroy, :move ],
-         :redirect_to => { :action => :list }
+         :redirect_to => { :action => :index }
 
   def index
-    list
-    render :action => 'list' unless request.xhr?
-  end
-
-  def list
     @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
-    render :action => "list", :layout => false if request.xhr?
+    render :action => "index", :layout => false if request.xhr?
   end
 
   def new
diff --git a/app/views/roles/list.rhtml b/app/views/roles/index.html.erb
similarity index 100%
rename from app/views/roles/list.rhtml
rename to app/views/roles/index.html.erb
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index 20040883..9159742c 100644
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_test.rb
@@ -35,7 +35,7 @@ class RolesControllerTest < ActionController::TestCase
   def test_get_index
     get :index
     assert_response :success
-    assert_template 'list'
+    assert_template 'index'
 
     assert_not_nil assigns(:roles)
     assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)