Change name attribute of file upload fields

Move from using eg. content.get('p6q1val1') which gives "service-definition-document" to an ID/name, eg. p6q1