Change class name for instrumentation