Unified namespaces, CS fixes