Renamed text fields
Merge and renamed text fields