Merge "Fix wrong service name"