Rework service init functions to pass down service name. This is