Fix: Fix ton of regression due to field name change