Updated enums to new names.