Replaced handwritten property-names by references