fixed naming conflict in module names