Namespace switch attrs
Merge branch 'namespace'