Simplification of script names, also old script functions