Simplify maintain_name method