Remove old fields and rename.