Make names repeat only when needed