BZ 1015952: Fixes to module name impacted incorrect hard-coded module name in the source code