Updating for enum name space changes