Fix module names.
Add dummy single and multiple modules to clear out previous modules.