Fixup names, etc