Merge "Update flag names."