Switch to namespaced enums