Use the local name instead of the original name in the check for name conflicts...