Adapt to use namespaced enums