Fix form handling after renaming field