3 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb
index 3975afcaf0..16b67b8ee7 100644
--- a/actionpack/lib/action_controller/deprecated/base.rb
+++ b/actionpack/lib/action_controller/deprecated/base.rb
@@ -96,7 +96,7 @@ module ActionController
 
       def resource_action_separator=(val)
         ActiveSupport::Deprecation.warn "ActionController::Base.resource_action_separator is deprecated and only " \
-                                        "works with the deprecated router DSL."
+                                        "works with the deprecated routes DSL."
         @resource_action_separator = val
       end
 
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 2281c500c5..8166d31719 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -47,7 +47,7 @@ module ActionController
   #
   # In AbstractController, dispatching is triggered directly by calling #process on a new controller.
   # ActionController::Metal provides an #action method that returns a valid Rack application for a
-  # given action. Other rack builders, such as Rack::Builder, Rack::URLMap, and the Rails router,
+  # given action. Other rack builders, such as Rack::Builder, Rack::URLMap, and the Rails routes,
   # can dispatch directly to the action returned by FooController.action(:index).
   class Metal < AbstractController::Base
     abstract!
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index c465035ca1..0c1e2fbe80 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -12,17 +12,17 @@ module ActionController
       ).merge(:script_name => request.script_name)
     end
 
-    def _router
+    def _routes
       raise "In order to use #url_for, you must include the helpers of a particular " \
-            "router. For instance, `include Rails.application.routes.url_helpers"
+            "routes. For instance, `include Rails.application.routes.url_helpers"
     end
 
     module ClassMethods
       def action_methods
         @action_methods ||= begin
-          super - _router.named_routes.helper_names
+          super - _routes.named_routes.helper_names
         end
       end
     end
   end
-end
-\ No newline at end of file
+end