Updated service and function names