Don't rely on aws tool to choose proper filenames when uploading into a directory.  Also name OSX uploads properly