Resolve name conflicts