Modify property names to fit with multi service environment