Backported name highlighting from 0.3dev