Changed service names to standard camel casing