Adding more support for names while instrumenting.