Switch to purely namespaced enums #18973