updated tracer code for generic names