Resolve naming conflicts