fix fields names