Instrument name handling fix