Switch to purely namespaced enums