Fixing some module names