Specifically, the service name and type values are changed to reflect their new values in the CLI tool. Fixed bug #1131058 Change-Id: I86530e655f0bfed09956654324f29587a7df8f2c