naming changes and adjusted namespaces for servicecore