clean up the module names