Rename fields f-me/carma#1809