Some renaming of modules to fit new functionality.