Revise flag names

Fixes #11320368331871