Rework namespaces