Update for upstream namespaces