Better handling of duplicate names.