[cleanUp] Rename fields too