Fix flag names for matching.