s/DomainJid/ServerBareJid/ s/DomainResourceJid/ServerFullJid/

to comply with RFC6120 1.4