aligning with new namespaces
Merge pull request #2 from paolovergori/master

APPLAT-1