...
Better names on some select scripts