fixing enterance name conflicts