Fixup on name