Tweaks for June proof pass, including getting exchange of name and alt name right