Rename flag-await to await-flag.