Fixing duplication in names