Cleanup: use a namespace.