updated scripts, and renaming