Simplified highlight group names
Wording