diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 362f451b608edde1736974ba70c771f9841d8f47..c0b7234cbf195400d00e643c3e3473712c98f6da 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -44,7 +44,6 @@ module ActionController
   autoload :Cookies,                  'action_controller/metal/cookies'
 
   autoload :ActionControllerError,    'action_controller/metal/exceptions'
-  autoload :SessionRestoreError,      'action_controller/metal/exceptions'
   autoload :RenderError,              'action_controller/metal/exceptions'
   autoload :RoutingError,             'action_controller/metal/exceptions'
   autoload :MethodNotAllowed,         'action_controller/metal/exceptions'
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index d0811254cb98f4b61b7b28b3463be4d9fb48f196..b9d23da3e0a7468fea59a30db0824b82dcdd3fd2 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -2,9 +2,6 @@ module ActionController
   class ActionControllerError < StandardError #:nodoc:
   end
 
-  class SessionRestoreError < ActionControllerError #:nodoc:
-  end
-
   class RenderError < ActionControllerError #:nodoc:
   end
 
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index e45745005962e6f1fbb1333594c8a79753edd71e..3e3b47317822ad65fa5adee7acf8a3cdcd248722 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -3,7 +3,7 @@
 
 module ActionDispatch # :nodoc:
   # Represents an HTTP response generated by a controller action. One can use
-  # an ActionController::Response object to retrieve the current state
+  # an ActionDispatch::Response object to retrieve the current state
   # of the response, or customize the response. An Response object can
   # either represent a "real" HTTP response (i.e. one that is meant to be sent
   # back to the web browser) or a test response (i.e. one that is generated
@@ -18,14 +18,14 @@ module ActionDispatch # :nodoc:
   # Nevertheless, integration tests may want to inspect controller responses in
   # more detail, and that's when Response can be useful for application
   # developers. Integration test methods such as
-  # ActionController::Integration::Session#get and
-  # ActionController::Integration::Session#post return objects of type
+  # ActionDispatch::Integration::Session#get and
+  # ActionDispatch::Integration::Session#post return objects of type
   # TestResponse (which are of course also of type Response).
   #
   # For example, the following demo integration "test" prints the body of the
   # controller response to the console:
   #
-  #  class DemoControllerTest < ActionController::IntegrationTest
+  #  class DemoControllerTest < ActionDispatch::IntegrationTest
   #    def test_print_root_path_to_console
   #      get('/')
   #      puts @response.body
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index a8768633cca0147d6cea98d18f469f4d34a67476..c5c06f74a243102a36ef0d6963cfd3d6d560624c 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -2,6 +2,9 @@
 
 module ActionDispatch
   module Session
+    class SessionRestoreError < StandardError #:nodoc:
+    end
+
     class AbstractStore
       ENV_SESSION_KEY = 'rack.session'.freeze
       ENV_SESSION_OPTIONS_KEY = 'rack.session.options'.freeze
@@ -19,7 +22,7 @@ def initialize(by, env)
 
         def session_id
           ActiveSupport::Deprecation.warn(
-            "ActionController::Session::AbstractStore::SessionHash#session_id " +
+            "ActionDispatch::Session::AbstractStore::SessionHash#session_id " +
             "has been deprecated. Please use request.session_options[:id] instead.", caller)
           @env[ENV_SESSION_OPTIONS_KEY][:id]
         end
@@ -62,7 +65,7 @@ def delete(key = nil)
 
         def data
          ActiveSupport::Deprecation.warn(
-           "ActionController::Session::AbstractStore::SessionHash#data " +
+           "ActionDispatch::Session::AbstractStore::SessionHash#data " +
            "has been deprecated. Please use #to_hash instead.", caller)
           to_hash
         end
@@ -98,7 +101,7 @@ def stale_session_check!
                 # Note that the regexp does not allow $1 to end with a ':'
                 $1.constantize
               rescue LoadError, NameError => const_error
-                raise ActionController::SessionRestoreError, "Session contains objects whose class definition isn't available.\nRemember to require the classes for all objects kept in the session.\n(Original exception: #{const_error.message} [#{const_error.class}])\n"
+                raise ActionDispatch::SessionRestoreError, "Session contains objects whose class definition isn't available.\nRemember to require the classes for all objects kept in the session.\n(Original exception: #{const_error.message} [#{const_error.class}])\n"
               end
 
               retry
diff --git a/actionpack/lib/action_dispatch/testing/test_response.rb b/actionpack/lib/action_dispatch/testing/test_response.rb
index c35982e0756e196a64ed00ef88c33a0c685a000d..6d019023ce4362597d3d0fc5b66f671eb8f480fa 100644
--- a/actionpack/lib/action_dispatch/testing/test_response.rb
+++ b/actionpack/lib/action_dispatch/testing/test_response.rb
@@ -1,6 +1,6 @@
 module ActionDispatch
-  # Integration test methods such as ActionController::Integration::Session#get
-  # and ActionController::Integration::Session#post return objects of class
+  # Integration test methods such as ActionDispatch::Integration::Session#get
+  # and ActionDispatch::Integration::Session#post return objects of class
   # TestResponse, which represent the HTTP response results of the requested
   # controller actions.
   #