ActiveModel::Naming should be extended instead of included (see naming.r...

ActiveModel::Naming should be extended instead of included (see naming.rb in the activemodel gem)

My app is depending on this and if you include you can get weird errors because model_name should not be defined on the instance.