Updating module names to resolve conflicts

Issue-ID: POLICY-2355
Change-Id: I64b6cd06186152a08df9b8bd11c21c154067fab1
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
5 files changed