Bug 25761: (QA follow-up) Consistent flag names