KRACOEUS-8606: fixing bugs from field rename
Merge pull request #1357 from leoherbie/KRACOEUS-8606

KRACOEUS-8606: fixing bugs from field rename