update namespaces
Merge pull request #1671 from antograssiot/3.0

3.0 update namespaces