Modify property names