Rename back
Merge remote-tracking branch 'origin/master'
Rename files to that used in the collection.
It's un again. For now...
Seems to work.