[Refactoring] Replace bare flags to descriptive enum names