Naming changes to XMPP Message