ActiveModel::Name doesn't respond to #underscore any more

Need to call #name first.