Renaming and cleanup of modules