Replacing ' ' with '_' fixes #386 wrong naming with S3

@rafatower CR this, please