Fix up double names