JC: added one more rename missing.
JC: removed :quote_class in mattr_accessor.