Fixing service name