Refactor rename fields
First working version ;)