Merge "property names correction"