fix enterance name conflicts