Updating for enum namespace changes in rust