Field naming fix