Updating for enum namespacing change