Thanks Caridad – I couldn't wait that long so I've spent the last few hours rebuilding all this (the types, views and view templates).
However I'm now having an issue with the View I had created. I tried to adapt it to the new field names but it wouldn't save. When I changed the layout it wouldn't update the changes.
I deleted it and tried with a new View but now it won't change it from the default Layout style (Grid) and won't let me add any fields to the layout. When I update it goes back to the default (Grid with no fields).
Cheers, Rob