Fix name redundancies