Switch to new namespaces for import/export functions