change method and property names