Update scripts to be more generic.