A little more renaming

need to commit
Return to single uploading for now
Merge pull request #160 from thecookiefactory/develop

No multiple upload for now