Regenerated to take advantage of support for multiple names for a single property.