Updating for enum namespacing