Restructuring of some of the script names