aligning with new namespaces