#32 rename data type from Common to Xmpp