Make moduleid names identical to service names.
Changes as part of this bug makes moduleid names same as the
names used for services. This impacts names of other entities
also like discovery service names.

Change-Id: I7ed53fe359601bf31ffe65e371b263b3f9bb92a3
Closes-PR: 1383577