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: I4141223e823e67049e7ec909f3254c60d772f8e7
Closes-PR: 1383577
Merge "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."