Fixed core modules namespaces