changes lots of service names to the accepted convention