more namespace changes
Merge branch 'namespacechange' into develop