ActiveModel demodulize and underscore fix