BUGFIX: rarely object names had a clash with the names given automatically.