Update JID and Name checks.