Another toName fix