Namespace rework