Merge "Rename the flag annotations"