Improved script names