Merge pull request #15599 from arthurnn/HABTMAssociation

Use HasAndBelongsToMany instead of HABTM

2 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 1d1201a838..6222bfe903 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1577,7 +1577,7 @@ module ActiveRecord
           scope   = nil
         end
 
-        habtm_reflection = ActiveRecord::Reflection::HABTMReflection.new(:has_and_belongs_to_many, name, scope, options, self)
+        habtm_reflection = ActiveRecord::Reflection::HasAndBelongsToManyReflection.new(:has_and_belongs_to_many, name, scope, options, self)
 
         builder = Builder::HasAndBelongsToMany.new name, self, options
 
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index d6686151be..24f3de019d 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -542,7 +542,7 @@ Joining, Preloading and eager loading of these associations is deprecated and wi
         end
     end
 
-    class HABTMReflection < AssociationReflection #:nodoc:
+    class HasAndBelongsToManyReflection < AssociationReflection #:nodoc:
       def initialize(macro, name, scope, options, active_record)
         super
         @collection = true