some enums renamed again so adjust them