Refactoring the script names