Corrected codegen to support shadowed module names.
Merge pull request #623 from Microsoft/shadowedModuleNames

Corrected codegen to support shadowed module names.