Fix: Ton of bugs into renaming fields