Replaced Namespaces with ModuleNames.