Set proper namespace.
Merge pull request #2926 from bar/3.0-connectionmanager

Set proper namespace.