Update scripts to new naming conventions