Fix names on join