refactored flag names