Fix highlight group names