Fix name conflict in instrumentation

Closes #194