Renamed explicit definition highlight groups
Cosmetics