Update for enum namespace change