Updated service names according to Angularjs best practices