Updated fieldnames and the after effects of this