Fixed fields names.