Merge "Change service name to sdnc-compatible"