Updating module names to match the renaming of the files.