Update namespaces for Core and PortableCore