There seems to be a bug with columns in SharePoint MOSS 2007. 

It allows you to add a new column say 'Team'. When you add this it stores the internal name as 'Team' which makes sense. The business then decide that 'Team' should be called 'Workstream', so you rename it as requested. The internal name remains 'Team' for this column in the root site collection.

A user then adds a new site column to a sub-site called 'Team' and uses this in various content types. You now have two columns or fields with the same internal name 'Team'.

I've now been asked to export and import the whole site collection to another server. When I do this stsadm.exe tells me that it has found a duplicate column and errors out.

I can't delete either column as they in are in use in various content types.

Can anyone suggest an approach to fix this?