Adapt to new namespace and property names / structure

[rfc2822]

Some changes to adapt to the new namespace and properties.

Made the changes to best of my PHP knowledge, but that's not much ;) Feel free to change it to "the right way".

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}