Include ActiveModel::Naming instead of extend

This is basically #15889, but incorporating the feedback from @rafaelfranca.