Revert Rename PropertyDefinitions to PropertyDefs and PropertyFieldDefinition to PropertyFieldDef