Adjustments to namespaces