Bug Fix: Let the class remap the attribute name first, before attempting to massage it into camel case.
Merge remote-tracking branch 'origin/master'