Bugfix time:

* Re-add '#name' properties for the buttons, so that the right one
  is selected on submit.
* Scrap the broken condition (using a wrong, previous variable name)
  so that the replaced file is added to the form state again on uploading.