Various fixes in WebService names