KRACOEUS-8606: fixing bugs from field rename