Merge pull request #1309 from thomasvl/leading_special_prop_names

Fix up handing of fields with leading names that should be all caps.