Bug 22417: Restore the concept of namespace