Fixing CoreController namespaces