Improve WS method names