Fix name highlighting