Add name usage highlighting
Comment out use highlighting