Use ActionDispatch::Routing everywhere

2 files changed, 3 insertions, 3 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index b3a57e2ced..67094392ee 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -48,7 +48,7 @@ module Rails
     end
 
     def routes
-      ::ActionController::Routing::Routes
+      ::ActionDispatch::Routing::Routes
     end
 
     def railties
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index ac0f440896..1d0ac38c96 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -1,9 +1,9 @@
 desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
 task :routes => :environment do
   Rails::Application.reload_routes!
-  all_routes = ENV['CONTROLLER'] ? ActionController::Routing::Routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : ActionController::Routing::Routes.routes
+  all_routes = ENV['CONTROLLER'] ? ActionDispatch::Routing::Routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : ActionDispatch::Routing::Routes.routes
   routes = all_routes.collect do |route|
-    name = ActionController::Routing::Routes.named_routes.routes.index(route).to_s
+    name = ActionDispatch::Routing::Routes.named_routes.routes.index(route).to_s
     reqs = route.requirements.empty? ? "" : route.requirements.inspect
     {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
   end