Changed S3 key names to match existing behavior
Consolidated S3 upload code to upload_file()