Repaired fields names