Fixing module names