change field name, update messages