more work with interfaces and renaming
Merge ../Peters/XMPP-SN