fix instruction name conflicts