Fix regression tests, fields have been renamed