Fix BZ1011833: Fixes to module name impacted the incorrect hard-coded module name in the Client class