update and clean up after field Field naming change