Fixed namespaces for new core distribution