Renamed scripts, since waits are non-default now