Enhance name conflict checks