Updating for enum namespace change