Improve ObjectNames

Quote property values as necessary and create an ObjectNameBuilder class.