Fix highlight and grammar name bugs