Addition of terminate() and renaming to modules.