1 files changed, 9 insertions, 2 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index de73715e35..2463f3951f 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -58,7 +58,6 @@ module ActiveRecord
     autoload :Base
     autoload :Callbacks
     autoload :CounterCache
-    autoload :DefaultScope
     autoload :DynamicMatchers
     autoload :DynamicFinderMatch
     autoload :DynamicScopeMatch
@@ -69,7 +68,6 @@ module ActiveRecord
     autoload :Migration
     autoload :Migrator, 'active_record/migration'
     autoload :ModelSchema
-    autoload :NamedScope
     autoload :NestedAttributes
     autoload :Observer
     autoload :Persistence
@@ -129,6 +127,15 @@ module ActiveRecord
     end
   end
 
+  module Scoping
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Named
+      autoload :Default
+    end
+  end
+
   autoload :TestCase
   autoload :TestFixtures, 'active_record/fixtures'
 end