Swap funder name and organisation in 'add dataset' form
Rename rest of "funding-id" to "fundingid"