Fix: Rename of fields