Changed the web service names

The previous names were way too long