diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 96fea741e0f3a5f66fc5c398d90bec990ee1ccca..0e3ed7aac71b777c5c330547d39309da59f2c468 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -423,8 +423,8 @@ class FixturesFileNotFound < StandardError; end
 # to the rescue:
 #
 #   george_reginald:
-#     monkey_id: <%= Fixtures.identify(:reginald) %>
-#     pirate_id: <%= Fixtures.identify(:george) %>
+#     monkey_id: <%= ActiveRecord::Fixtures.identify(:reginald) %>
+#     pirate_id: <%= ActiveRecord::Fixtures.identify(:george) %>
 #
 # == Support for YAML defaults
 #
@@ -444,369 +444,374 @@ class FixturesFileNotFound < StandardError; end
 #
 # Any fixture labeled "DEFAULTS" is safely ignored.
 
-class Fixtures
-  MAX_ID = 2 ** 30 - 1
+Fixture = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Fixture', 'ActiveRecord::Fixture')
+Fixtures = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Fixtures', 'ActiveRecord::Fixtures')
 
-  @@all_cached_fixtures = Hash.new { |h,k| h[k] = {} }
+module ActiveRecord
+  class Fixtures
+    MAX_ID = 2 ** 30 - 1
 
-  def self.find_table_name(table_name) # :nodoc:
-    ActiveRecord::Base.pluralize_table_names ?
-      table_name.to_s.singularize.camelize :
-      table_name.to_s.camelize
-  end
+    @@all_cached_fixtures = Hash.new { |h,k| h[k] = {} }
 
-  def self.reset_cache
-    @@all_cached_fixtures.clear
-  end
+    def self.find_table_name(table_name) # :nodoc:
+      ActiveRecord::Base.pluralize_table_names ?
+        table_name.to_s.singularize.camelize :
+        table_name.to_s.camelize
+    end
 
-  def self.cache_for_connection(connection)
-    @@all_cached_fixtures[connection]
-  end
+    def self.reset_cache
+      @@all_cached_fixtures.clear
+    end
 
-  def self.fixture_is_cached?(connection, table_name)
-    cache_for_connection(connection)[table_name]
-  end
+    def self.cache_for_connection(connection)
+      @@all_cached_fixtures[connection]
+    end
 
-  def self.cached_fixtures(connection, keys_to_fetch = nil)
-    if keys_to_fetch
-      cache_for_connection(connection).values_at(*keys_to_fetch)
-    else
-      cache_for_connection(connection).values
+    def self.fixture_is_cached?(connection, table_name)
+      cache_for_connection(connection)[table_name]
     end
-  end
 
-  def self.cache_fixtures(connection, fixtures_map)
-    cache_for_connection(connection).update(fixtures_map)
-  end
+    def self.cached_fixtures(connection, keys_to_fetch = nil)
+      if keys_to_fetch
+        cache_for_connection(connection).values_at(*keys_to_fetch)
+      else
+        cache_for_connection(connection).values
+      end
+    end
+
+    def self.cache_fixtures(connection, fixtures_map)
+      cache_for_connection(connection).update(fixtures_map)
+    end
 
-  def self.instantiate_fixtures(object, fixture_name, fixtures, load_instances = true)
-    if load_instances
-      fixtures.each do |name, fixture|
-        begin
-          object.instance_variable_set "@#{name}", fixture.find
-        rescue FixtureClassNotFound
-          nil
+    def self.instantiate_fixtures(object, fixture_name, fixtures, load_instances = true)
+      if load_instances
+        fixtures.each do |name, fixture|
+          begin
+            object.instance_variable_set "@#{name}", fixture.find
+          rescue FixtureClassNotFound
+            nil
+          end
         end
       end
     end
-  end
 
-  def self.instantiate_all_loaded_fixtures(object, load_instances = true)
-    all_loaded_fixtures.each do |table_name, fixtures|
-      Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances)
+    def self.instantiate_all_loaded_fixtures(object, load_instances = true)
+      all_loaded_fixtures.each do |table_name, fixtures|
+        ActiveRecord::Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances)
+      end
     end
-  end
 
-  cattr_accessor :all_loaded_fixtures
-  self.all_loaded_fixtures = {}
+    cattr_accessor :all_loaded_fixtures
+    self.all_loaded_fixtures = {}
 
-  def self.create_fixtures(fixtures_directory, table_names, class_names = {})
-    table_names = [table_names].flatten.map { |n| n.to_s }
-    table_names.each { |n|
-      class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
-    }
+    def self.create_fixtures(fixtures_directory, table_names, class_names = {})
+      table_names = [table_names].flatten.map { |n| n.to_s }
+      table_names.each { |n|
+        class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
+      }
 
-    # FIXME: Apparently JK uses this.
-    connection = block_given? ? yield : ActiveRecord::Base.connection
+      # FIXME: Apparently JK uses this.
+      connection = block_given? ? yield : ActiveRecord::Base.connection
 
-    files_to_read = table_names.reject { |table_name|
-      fixture_is_cached?(connection, table_name)
-    }
+      files_to_read = table_names.reject { |table_name|
+        fixture_is_cached?(connection, table_name)
+      }
 
-    unless files_to_read.empty?
-      connection.disable_referential_integrity do
-        fixtures_map = {}
+      unless files_to_read.empty?
+        connection.disable_referential_integrity do
+          fixtures_map = {}
 
-        fixture_files = files_to_read.map do |path|
-          table_name = path.tr '/', '_'
+          fixture_files = files_to_read.map do |path|
+            table_name = path.tr '/', '_'
 
-          fixtures_map[path] = Fixtures.new(
-            connection,
-            table_name,
-            class_names[table_name.to_sym] || table_name.classify,
-            File.join(fixtures_directory, path))
-        end
+            fixtures_map[path] = ActiveRecord::Fixtures.new(
+              connection,
+              table_name,
+              class_names[table_name.to_sym] || table_name.classify,
+              File.join(fixtures_directory, path))
+          end
 
-        all_loaded_fixtures.update(fixtures_map)
+          all_loaded_fixtures.update(fixtures_map)
 
-        connection.transaction(:requires_new => true) do
-          fixture_files.each do |ff|
-            conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
-            table_rows = ff.table_rows
+          connection.transaction(:requires_new => true) do
+            fixture_files.each do |ff|
+              conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
+              table_rows = ff.table_rows
 
-            table_rows.keys.each do |table|
-              conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
-            end
+              table_rows.keys.each do |table|
+                conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
+              end
 
-            table_rows.each do |table_name,rows|
-              rows.each do |row|
-                conn.insert_fixture(row, table_name)
+              table_rows.each do |table_name,rows|
+                rows.each do |row|
+                  conn.insert_fixture(row, table_name)
+                end
               end
             end
-          end
 
-          # Cap primary key sequences to max(pk).
-          if connection.respond_to?(:reset_pk_sequence!)
-            table_names.each do |table_name|
-              connection.reset_pk_sequence!(table_name.tr('/', '_'))
+            # Cap primary key sequences to max(pk).
+            if connection.respond_to?(:reset_pk_sequence!)
+              table_names.each do |table_name|
+                connection.reset_pk_sequence!(table_name.tr('/', '_'))
+              end
             end
           end
-        end
 
-        cache_fixtures(connection, fixtures_map)
+          cache_fixtures(connection, fixtures_map)
+        end
       end
+      cached_fixtures(connection, table_names)
     end
-    cached_fixtures(connection, table_names)
-  end
-
-  # Returns a consistent, platform-independent identifier for +label+.
-  # Identifiers are positive integers less than 2^32.
-  def self.identify(label)
-    Zlib.crc32(label.to_s) % MAX_ID
-  end
 
-  attr_reader :table_name, :name, :fixtures, :model_class
-
-  def initialize(connection, table_name, class_name, fixture_path)
-    @connection   = connection
-    @table_name   = table_name
-    @fixture_path = fixture_path
-    @name         = table_name # preserve fixture base name
-    @class_name   = class_name
-
-    @fixtures     = ActiveSupport::OrderedHash.new
-    @table_name   = "#{ActiveRecord::Base.table_name_prefix}#{@table_name}#{ActiveRecord::Base.table_name_suffix}"
-
-    # Should be an AR::Base type class
-    if class_name.is_a?(Class)
-      @table_name   = class_name.table_name
-      @connection   = class_name.connection
-      @model_class  = class_name
-    else
-      @model_class  = class_name.constantize rescue nil
+    # Returns a consistent, platform-independent identifier for +label+.
+    # Identifiers are positive integers less than 2^32.
+    def self.identify(label)
+      Zlib.crc32(label.to_s) % MAX_ID
     end
 
-    read_fixture_files
-  end
+    attr_reader :table_name, :name, :fixtures, :model_class
 
-  def [](x)
-    fixtures[x]
-  end
+    def initialize(connection, table_name, class_name, fixture_path)
+      @connection   = connection
+      @table_name   = table_name
+      @fixture_path = fixture_path
+      @name         = table_name # preserve fixture base name
+      @class_name   = class_name
 
-  def []=(k,v)
-    fixtures[k] = v
-  end
+      @fixtures     = ActiveSupport::OrderedHash.new
+      @table_name   = "#{ActiveRecord::Base.table_name_prefix}#{@table_name}#{ActiveRecord::Base.table_name_suffix}"
 
-  def each(&block)
-    fixtures.each(&block)
-  end
+      # Should be an AR::Base type class
+      if class_name.is_a?(Class)
+        @table_name   = class_name.table_name
+        @connection   = class_name.connection
+        @model_class  = class_name
+      else
+        @model_class  = class_name.constantize rescue nil
+      end
 
-  def size
-    fixtures.size
-  end
+      read_fixture_files
+    end
 
-  # Return a hash of rows to be inserted.  The key is the table, the value is
-  # a list of rows to insert to that table.
-  def table_rows
-    now = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
-    now = now.to_s(:db)
+    def [](x)
+      fixtures[x]
+    end
 
-    # allow a standard key to be used for doing defaults in YAML
-    fixtures.delete('DEFAULTS')
+    def []=(k,v)
+      fixtures[k] = v
+    end
 
-    # track any join tables we need to insert later
-    rows = Hash.new { |h,table| h[table] = [] }
+    def each(&block)
+      fixtures.each(&block)
+    end
 
-    rows[table_name] = fixtures.map do |label, fixture|
-      row = fixture.to_hash
+    def size
+      fixtures.size
+    end
 
-      if model_class && model_class < ActiveRecord::Base
-        # fill in timestamp columns if they aren't specified and the model is set to record_timestamps
-        if model_class.record_timestamps
-          timestamp_column_names.each do |name|
-            row[name] = now unless row.key?(name)
-          end
-        end
+    # Return a hash of rows to be inserted.  The key is the table, the value is
+    # a list of rows to insert to that table.
+    def table_rows
+      now = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
+      now = now.to_s(:db)
 
-        # interpolate the fixture label
-        row.each do |key, value|
-          row[key] = label if value == "$LABEL"
-        end
+      # allow a standard key to be used for doing defaults in YAML
+      fixtures.delete('DEFAULTS')
 
-        # generate a primary key if necessary
-        if has_primary_key_column? && !row.include?(primary_key_name)
-          row[primary_key_name] = Fixtures.identify(label)
-        end
+      # track any join tables we need to insert later
+      rows = Hash.new { |h,table| h[table] = [] }
+
+      rows[table_name] = fixtures.map do |label, fixture|
+        row = fixture.to_hash
 
-        # If STI is used, find the correct subclass for association reflection
-        reflection_class =
-          if row.include?(inheritance_column_name)
-            row[inheritance_column_name].constantize rescue model_class
-          else
-            model_class
+        if model_class && model_class < ActiveRecord::Base
+          # fill in timestamp columns if they aren't specified and the model is set to record_timestamps
+          if model_class.record_timestamps
+            timestamp_column_names.each do |name|
+              row[name] = now unless row.key?(name)
+            end
           end
 
-        reflection_class.reflect_on_all_associations.each do |association|
-          case association.macro
-          when :belongs_to
-            # Do not replace association name with association foreign key if they are named the same
-            fk_name = (association.options[:foreign_key] || "#{association.name}_id").to_s
+          # interpolate the fixture label
+          row.each do |key, value|
+            row[key] = label if value == "$LABEL"
+          end
 
-            if association.name.to_s != fk_name && value = row.delete(association.name.to_s)
-              if association.options[:polymorphic] && value.sub!(/\s*\(([^\)]*)\)\s*$/, "")
-                # support polymorphic belongs_to as "label (Type)"
-                row[association.foreign_type] = $1
-              end
+          # generate a primary key if necessary
+          if has_primary_key_column? && !row.include?(primary_key_name)
+            row[primary_key_name] = ActiveRecord::Fixtures.identify(label)
+          end
 
-              row[fk_name] = Fixtures.identify(value)
+          # If STI is used, find the correct subclass for association reflection
+          reflection_class =
+            if row.include?(inheritance_column_name)
+              row[inheritance_column_name].constantize rescue model_class
+            else
+              model_class
             end
-          when :has_and_belongs_to_many
-            if (targets = row.delete(association.name.to_s))
-              targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
-              table_name = association.options[:join_table]
-              rows[table_name].concat targets.map { |target|
-                { association.foreign_key             => row[primary_key_name],
-                  association.association_foreign_key => Fixtures.identify(target) }
-              }
+
+          reflection_class.reflect_on_all_associations.each do |association|
+            case association.macro
+            when :belongs_to
+              # Do not replace association name with association foreign key if they are named the same
+              fk_name = (association.options[:foreign_key] || "#{association.name}_id").to_s
+
+              if association.name.to_s != fk_name && value = row.delete(association.name.to_s)
+                if association.options[:polymorphic] && value.sub!(/\s*\(([^\)]*)\)\s*$/, "")
+                  # support polymorphic belongs_to as "label (Type)"
+                  row[association.foreign_type] = $1
+                end
+
+                row[fk_name] = ActiveRecord::Fixtures.identify(value)
+              end
+            when :has_and_belongs_to_many
+              if (targets = row.delete(association.name.to_s))
+                targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
+                table_name = association.options[:join_table]
+                rows[table_name].concat targets.map { |target|
+                  { association.foreign_key             => row[primary_key_name],
+                    association.association_foreign_key => ActiveRecord::Fixtures.identify(target) }
+                }
+              end
             end
           end
         end
-      end
-
-      row
-    end
-    rows
-  end
 
-  private
-    def primary_key_name
-      @primary_key_name ||= model_class && model_class.primary_key
+        row
+      end
+      rows
     end
 
-    def has_primary_key_column?
-      @has_primary_key_column ||= primary_key_name &&
-        model_class.columns.any? { |c| c.name == primary_key_name }
-    end
+    private
+      def primary_key_name
+        @primary_key_name ||= model_class && model_class.primary_key
+      end
 
-    def timestamp_column_names
-      @timestamp_column_names ||=
-        %w(created_at created_on updated_at updated_on) & column_names
-    end
+      def has_primary_key_column?
+        @has_primary_key_column ||= primary_key_name &&
+          model_class.columns.any? { |c| c.name == primary_key_name }
+      end
 
-    def inheritance_column_name
-      @inheritance_column_name ||= model_class && model_class.inheritance_column
-    end
+      def timestamp_column_names
+        @timestamp_column_names ||=
+          %w(created_at created_on updated_at updated_on) & column_names
+      end
 
-    def column_names
-      @column_names ||= @connection.columns(@table_name).collect { |c| c.name }
-    end
+      def inheritance_column_name
+        @inheritance_column_name ||= model_class && model_class.inheritance_column
+      end
 
-    def read_fixture_files
-      if File.file?(yaml_file_path)
-        read_yaml_fixture_files
-      elsif File.file?(csv_file_path)
-        read_csv_fixture_files
-      else
-        raise FixturesFileNotFound, "Could not find #{yaml_file_path} or #{csv_file_path}"
+      def column_names
+        @column_names ||= @connection.columns(@table_name).collect { |c| c.name }
       end
-    end
 
-    def read_yaml_fixture_files
-      yaml_string = (Dir["#{@fixture_path}/**/*.yml"].select { |f|
-        File.file?(f)
-      } + [yaml_file_path]).map { |file_path| IO.read(file_path) }.join
-
-      if yaml = parse_yaml_string(yaml_string)
-        # If the file is an ordered map, extract its children.
-        yaml_value =
-          if yaml.respond_to?(:type_id) && yaml.respond_to?(:value)
-            yaml.value
-          else
-            [yaml]
-          end
+      def read_fixture_files
+        if File.file?(yaml_file_path)
+          read_yaml_fixture_files
+        elsif File.file?(csv_file_path)
+          read_csv_fixture_files
+        else
+          raise FixturesFileNotFound, "Could not find #{yaml_file_path} or #{csv_file_path}"
+        end
+      end
 
-        yaml_value.each do |fixture|
-          raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{fixture}" unless fixture.respond_to?(:each)
-          fixture.each do |name, data|
-            unless data
-              raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
+      def read_yaml_fixture_files
+        yaml_string = (Dir["#{@fixture_path}/**/*.yml"].select { |f|
+          File.file?(f)
+        } + [yaml_file_path]).map { |file_path| IO.read(file_path) }.join
+
+        if yaml = parse_yaml_string(yaml_string)
+          # If the file is an ordered map, extract its children.
+          yaml_value =
+            if yaml.respond_to?(:type_id) && yaml.respond_to?(:value)
+              yaml.value
+            else
+              [yaml]
             end
 
-            fixtures[name] = Fixture.new(data, model_class)
+          yaml_value.each do |fixture|
+            raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{fixture}" unless fixture.respond_to?(:each)
+            fixture.each do |name, data|
+              unless data
+                raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
+              end
+
+              fixtures[name] = ActiveRecord::Fixture.new(data, model_class)
+            end
           end
         end
       end
-    end
 
-    def read_csv_fixture_files
-      reader = CSV.parse(erb_render(IO.read(csv_file_path)))
-      header = reader.shift
-      i = 0
-      reader.each do |row|
-        data = {}
-        row.each_with_index { |cell, j| data[header[j].to_s.strip] = cell.to_s.strip }
-        fixtures["#{@class_name.to_s.underscore}_#{i+=1}"] = Fixture.new(data, model_class)
+      def read_csv_fixture_files
+        reader = CSV.parse(erb_render(IO.read(csv_file_path)))
+        header = reader.shift
+        i = 0
+        reader.each do |row|
+          data = {}
+          row.each_with_index { |cell, j| data[header[j].to_s.strip] = cell.to_s.strip }
+          fixtures["#{@class_name.to_s.underscore}_#{i+=1}"] = ActiveRecord::Fixture.new(data, model_class)
+        end
       end
-    end
 
-    def yaml_file_path
-      "#{@fixture_path}.yml"
-    end
+      def yaml_file_path
+        "#{@fixture_path}.yml"
+      end
 
-    def csv_file_path
-      @fixture_path + ".csv"
-    end
+      def csv_file_path
+        @fixture_path + ".csv"
+      end
 
-    def yaml_fixtures_key(path)
-      File.basename(@fixture_path).split(".").first
-    end
+      def yaml_fixtures_key(path)
+        File.basename(@fixture_path).split(".").first
+      end
 
-    def parse_yaml_string(fixture_content)
-      YAML::load(erb_render(fixture_content))
-    rescue => error
-      raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{error.class}: #{error}"
-    end
+      def parse_yaml_string(fixture_content)
+        YAML::load(erb_render(fixture_content))
+      rescue => error
+        raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{error.class}: #{error}"
+      end
 
-    def erb_render(fixture_content)
-      ERB.new(fixture_content).result
-    end
-end
+      def erb_render(fixture_content)
+        ERB.new(fixture_content).result
+      end
+  end
 
-class Fixture #:nodoc:
-  include Enumerable
+  class Fixture #:nodoc:
+    include Enumerable
 
-  class FixtureError < StandardError #:nodoc:
-  end
+    class FixtureError < StandardError #:nodoc:
+    end
 
-  class FormatError < FixtureError #:nodoc:
-  end
+    class FormatError < FixtureError #:nodoc:
+    end
 
-  attr_reader :model_class, :fixture
+    attr_reader :model_class, :fixture
 
-  def initialize(fixture, model_class)
-    @fixture     = fixture
-    @model_class = model_class
-  end
+    def initialize(fixture, model_class)
+      @fixture     = fixture
+      @model_class = model_class
+    end
 
-  def class_name
-    model_class.name if model_class
-  end
+    def class_name
+      model_class.name if model_class
+    end
 
-  def each
-    fixture.each { |item| yield item }
-  end
+    def each
+      fixture.each { |item| yield item }
+    end
 
-  def [](key)
-    fixture[key]
-  end
+    def [](key)
+      fixture[key]
+    end
 
-  alias :to_hash :fixture
+    alias :to_hash :fixture
 
-  def find
-    if model_class
-      model_class.find(fixture[model_class.primary_key])
-    else
-      raise FixtureClassNotFound, "No class attached to find."
+    def find
+      if model_class
+        model_class.find(fixture[model_class.primary_key])
+      else
+        raise FixtureClassNotFound, "No class attached to find."
+      end
     end
   end
 end
@@ -832,7 +837,7 @@ module TestFixtures
       self.pre_loaded_fixtures = false
 
       self.fixture_class_names = Hash.new do |h, table_name|
-        h[table_name] = Fixtures.find_table_name(table_name)
+        h[table_name] = ActiveRecord::Fixtures.find_table_name(table_name)
       end
     end
 
@@ -944,7 +949,7 @@ def setup_fixtures
         ActiveRecord::Base.connection.begin_db_transaction
       # Load fixtures for every test.
       else
-        Fixtures.reset_cache
+        ActiveRecord::Fixtures.reset_cache
         @@already_loaded_fixtures[self.class] = nil
         @loaded_fixtures = load_fixtures
       end
@@ -957,7 +962,7 @@ def teardown_fixtures
       return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
 
       unless run_in_transaction?
-        Fixtures.reset_cache
+        ActiveRecord::Fixtures.reset_cache
       end
 
       # Rollback changes if a transaction is active.
@@ -970,7 +975,7 @@ def teardown_fixtures
 
     private
       def load_fixtures
-        fixtures = Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
+        fixtures = ActiveRecord::Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
         Hash[fixtures.map { |f| [f.name, f] }]
       end
 
@@ -979,16 +984,16 @@ def load_fixtures
 
       def instantiate_fixtures
         if pre_loaded_fixtures
-          raise RuntimeError, 'Load fixtures before instantiating them.' if Fixtures.all_loaded_fixtures.empty?
+          raise RuntimeError, 'Load fixtures before instantiating them.' if ActiveRecord::Fixtures.all_loaded_fixtures.empty?
           unless @@required_fixture_classes
-            self.class.require_fixture_classes Fixtures.all_loaded_fixtures.keys
+            self.class.require_fixture_classes ActiveRecord::Fixtures.all_loaded_fixtures.keys
             @@required_fixture_classes = true
           end
-          Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
+          ActiveRecord::Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
         else
           raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
           @loaded_fixtures.each do |fixture_name, fixtures|
-            Fixtures.instantiate_fixtures(self, fixture_name, fixtures, load_instances?)
+            ActiveRecord::Fixtures.instantiate_fixtures(self, fixture_name, fixtures, load_instances?)
           end
         end
       end
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 5703fac0330c118155281430d128b03b23151d78..c6bc040f9fa0f7ade80edf8f2151b5024ab9bc27 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -305,7 +305,7 @@ db_namespace = namespace :db do
       fixtures_dir = File.join [base_dir, ENV['FIXTURES_DIR']].compact
 
       (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir["#{fixtures_dir}/**/*.{yml,csv}"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file|
-        Fixtures.create_fixtures(fixtures_dir, fixture_file)
+        ActiveRecord::Fixtures.create_fixtures(fixtures_dir, fixture_file)
       end
     end
 
@@ -316,13 +316,13 @@ db_namespace = namespace :db do
       label, id = ENV['LABEL'], ENV['ID']
       raise 'LABEL or ID required' if label.blank? && id.blank?
 
-      puts %Q(The fixture ID for "#{label}" is #{Fixtures.identify(label)}.) if label
+      puts %Q(The fixture ID for "#{label}" is #{ActiveRecord::Fixtures.identify(label)}.) if label
 
       base_dir = ENV['FIXTURES_PATH'] ? File.join(Rails.root, ENV['FIXTURES_PATH']) : File.join(Rails.root, 'test', 'fixtures')
       Dir["#{base_dir}/**/*.yml"].each do |file|
         if data = YAML::load(ERB.new(IO.read(file)).result)
           data.keys.each do |key|
-            key_id = Fixtures.identify(key)
+            key_id = ActiveRecord::Fixtures.identify(key)
 
             if key == label || key_id == id.to_i
               puts "#{file}: #{key} (#{key_id})"
diff --git a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
index 43015098c94551fb3db85735940dafd143f15212..292c7efebb2ea48f7b5f2b3c07cc70a9c01cf8e1 100644
--- a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
@@ -138,7 +138,7 @@ def test_associations_work_with_reserved_words
   private
   # custom fixture loader, uses Fixtures#create_fixtures and appends base_path to the current file's path
   def create_test_fixtures(*fixture_names)
-    Fixtures.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
+    ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
   end
 
   # custom drop table, uses execute on connection to drop a table if it exists. note: escapes table_name
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
index 1efa7deaeb82f70ecef7151ddfb2346cab118cd1..752b8648182486cfa3a7c37b8b94cae75cf2a2e5 100644
--- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
@@ -138,7 +138,7 @@ def test_associations_work_with_reserved_words
   private
   # custom fixture loader, uses Fixtures#create_fixtures and appends base_path to the current file's path
   def create_test_fixtures(*fixture_names)
-    Fixtures.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
+    ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
   end
 
   # custom drop table, uses execute on connection to drop a table if it exists. note: escapes table_name
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 3e201552101d74b0f1bd08d762790a3860c0543a..2bf192e2c69234fcfcb6f3627aa8957dd6baacaf 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -36,7 +36,7 @@ def test_clean_fixtures
     FIXTURES.each do |name|
       fixtures = nil
       assert_nothing_raised { fixtures = create_fixtures(name).first }
-      assert_kind_of(Fixtures, fixtures)
+      assert_kind_of(ActiveRecord::Fixtures, fixtures)
       fixtures.each { |_name, fixture|
         fixture.each { |key, value|
           assert_match(MATCH_ATTRIBUTE_NAME, key)
@@ -46,7 +46,7 @@ def test_clean_fixtures
   end
 
   def test_create_fixtures
-    Fixtures.create_fixtures(FIXTURES_ROOT, "parrots")
+    ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT, "parrots")
     assert Parrot.find_by_name('Curious George'), 'George is in the database'
   end
 
@@ -54,7 +54,7 @@ def test_multiple_clean_fixtures
     fixtures_array = nil
     assert_nothing_raised { fixtures_array = create_fixtures(*FIXTURES) }
     assert_kind_of(Array, fixtures_array)
-    fixtures_array.each { |fixtures| assert_kind_of(Fixtures, fixtures) }
+    fixtures_array.each { |fixtures| assert_kind_of(ActiveRecord::Fixtures, fixtures) }
   end
 
   def test_attributes
@@ -75,7 +75,7 @@ def test_inserts
   if ActiveRecord::Base.connection.supports_migrations?
     def test_inserts_with_pre_and_suffix
       # Reset cache to make finds on the new table work
-      Fixtures.reset_cache
+      ActiveRecord::Fixtures.reset_cache
 
       ActiveRecord::Base.connection.create_table :prefix_topics_suffix do |t|
         t.column :title, :string
@@ -150,11 +150,11 @@ def test_erb_in_fixtures
   end
 
   def test_empty_yaml_fixture
-    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/yml/accounts")
+    assert_not_nil ActiveRecord::Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/yml/accounts")
   end
 
   def test_empty_yaml_fixture_with_a_comment_in_it
-    assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', FIXTURES_ROOT + "/naked/yml/companies")
+    assert_not_nil ActiveRecord::Fixtures.new( Account.connection, "companies", 'Company', FIXTURES_ROOT + "/naked/yml/companies")
   end
 
   def test_nonexistent_fixture_file
@@ -164,23 +164,23 @@ def test_nonexistent_fixture_file
     assert Dir[nonexistent_fixture_path+"*"].empty?
 
     assert_raise(FixturesFileNotFound) do
-      Fixtures.new( Account.connection, "companies", 'Company', nonexistent_fixture_path)
+      ActiveRecord::Fixtures.new( Account.connection, "companies", 'Company', nonexistent_fixture_path)
     end
   end
 
   def test_dirty_dirty_yaml_file
-    assert_raise(Fixture::FormatError) do
-      Fixtures.new( Account.connection, "courses", 'Course', FIXTURES_ROOT + "/naked/yml/courses")
+    assert_raise(ActiveRecord::Fixture::FormatError) do
+      ActiveRecord::Fixtures.new( Account.connection, "courses", 'Course', FIXTURES_ROOT + "/naked/yml/courses")
     end
   end
 
   def test_empty_csv_fixtures
-    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/csv/accounts")
+    assert_not_nil ActiveRecord::Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/csv/accounts")
   end
 
   def test_omap_fixtures
     assert_nothing_raised do
-      fixtures = Fixtures.new(Account.connection, 'categories', 'Category', FIXTURES_ROOT + "/categories_ordered")
+      fixtures = ActiveRecord::Fixtures.new(Account.connection, 'categories', 'Category', FIXTURES_ROOT + "/categories_ordered")
 
       i = 0
       fixtures.each do |name, fixture|
@@ -220,7 +220,7 @@ class FixturesResetPkSequenceTest < ActiveRecord::TestCase
 
     def setup
       @instances = [Account.new(:credit_limit => 50), Company.new(:name => 'RoR Consulting')]
-      Fixtures.reset_cache # make sure tables get reinitialized
+      ActiveRecord::Fixtures.reset_cache # make sure tables get reinitialized
     end
 
     def test_resets_to_min_pk_with_specified_pk_and_sequence
@@ -524,13 +524,13 @@ class FasterFixturesTest < ActiveRecord::TestCase
 
   def load_extra_fixture(name)
     fixture = create_fixtures(name).first
-    assert fixture.is_a?(Fixtures)
+    assert fixture.is_a?(ActiveRecord::Fixtures)
     @loaded_fixtures[fixture.table_name] = fixture
   end
 
   def test_cache
-    assert Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'categories')
-    assert Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'authors')
+    assert ActiveRecord::Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'categories')
+    assert ActiveRecord::Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'authors')
 
     assert_no_queries do
       create_fixtures('categories')
@@ -538,7 +538,7 @@ def test_cache
     end
 
     load_extra_fixture('posts')
-    assert Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'posts')
+    assert ActiveRecord::Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'posts')
     self.class.setup_fixture_accessors('posts')
     assert_equal 'Welcome to the weblog', posts(:welcome).title
   end
@@ -548,17 +548,17 @@ class FoxyFixturesTest < ActiveRecord::TestCase
   fixtures :parrots, :parrots_pirates, :pirates, :treasures, :mateys, :ships, :computers, :developers, :"admin/accounts", :"admin/users"
 
   def test_identifies_strings
-    assert_equal(Fixtures.identify("foo"), Fixtures.identify("foo"))
-    assert_not_equal(Fixtures.identify("foo"), Fixtures.identify("FOO"))
+    assert_equal(ActiveRecord::Fixtures.identify("foo"), ActiveRecord::Fixtures.identify("foo"))
+    assert_not_equal(ActiveRecord::Fixtures.identify("foo"), ActiveRecord::Fixtures.identify("FOO"))
   end
 
   def test_identifies_symbols
-    assert_equal(Fixtures.identify(:foo), Fixtures.identify(:foo))
+    assert_equal(ActiveRecord::Fixtures.identify(:foo), ActiveRecord::Fixtures.identify(:foo))
   end
 
   def test_identifies_consistently
-    assert_equal 207281424, Fixtures.identify(:ruby)
-    assert_equal 1066363776, Fixtures.identify(:sapphire_2)
+    assert_equal 207281424, ActiveRecord::Fixtures.identify(:ruby)
+    assert_equal 1066363776, ActiveRecord::Fixtures.identify(:sapphire_2)
   end
 
   TIMESTAMP_COLUMNS = %w(created_at created_on updated_at updated_on)
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index fd20f1b120b8db1adba7e2f26449e845b331d42f..fbb4ee6f7bd0e41a42cd04ae23d909ab88639411 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -104,7 +104,7 @@ class ActiveSupport::TestCase
   self.use_transactional_fixtures = true
 
   def create_fixtures(*table_names, &block)
-    Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, fixture_class_names, &block)
+    ActiveRecord::Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, fixture_class_names, &block)
   end
 end
 
diff --git a/activerecord/test/fixtures/mateys.yml b/activerecord/test/fixtures/mateys.yml
index 9ecdd4ecd57761598d5f2160189a987dfab766c1..d3690955fc9c28acd0c73a9c145151d6f415c8cc 100644
--- a/activerecord/test/fixtures/mateys.yml
+++ b/activerecord/test/fixtures/mateys.yml
@@ -1,4 +1,4 @@
 blackbeard_to_redbeard:
-  pirate_id: <%= Fixtures.identify(:blackbeard) %>
-  target_id: <%= Fixtures.identify(:redbeard) %>
+  pirate_id: <%= ActiveRecord::Fixtures.identify(:blackbeard) %>
+  target_id: <%= ActiveRecord::Fixtures.identify(:redbeard) %>
   weight: 10
diff --git a/activerecord/test/fixtures/parrots_pirates.yml b/activerecord/test/fixtures/parrots_pirates.yml
index 6b17a37d686f611a1f842b99f2736bf53245531a..66472243c7f4e9d1f99ff8eca1246daff638e387 100644
--- a/activerecord/test/fixtures/parrots_pirates.yml
+++ b/activerecord/test/fixtures/parrots_pirates.yml
@@ -1,7 +1,7 @@
 george_blackbeard:
-  parrot_id: <%= Fixtures.identify(:george) %>
-  pirate_id: <%= Fixtures.identify(:blackbeard) %>
+  parrot_id: <%= ActiveRecord::Fixtures.identify(:george) %>
+  pirate_id: <%= ActiveRecord::Fixtures.identify(:blackbeard) %>
 
 louis_blackbeard:
-  parrot_id: <%= Fixtures.identify(:louis) %>
-  pirate_id: <%= Fixtures.identify(:blackbeard) %>
+  parrot_id: <%= ActiveRecord::Fixtures.identify(:louis) %>
+  pirate_id: <%= ActiveRecord::Fixtures.identify(:blackbeard) %>