[Optimize Use] Fix: do not add names more than once