Use consitent camel case for services
Merge branch 'master' into gal_service_name