Unified namespace and CS fixes