Merge "Renaming COMPPREDMODE_TYPE enum and its members."