Two files have the same name, blah, blah, blah

[Joe-1957]

I was a dog agility trial this weekend, I took about 17,000 pictures just on Saturday, spanned over six cards.

I often get that message that says something like multiple files have the same names, if you want to keep both files a number will be added to one of them. That in itself isn't a big deal, but it's kind of a pain when pictures are downloading and I walk away from the computer and walk back only to find that message that I have to do something with before it continues to download. (The files are *always* different)
Is there some naming scheme that I can set in the camera to prevent that from happening?

I have a Canon 7D MK II

Joe
http://dogshots.biz

[NHL]

Try to copy the whole folder from the flash card instead of individual images...
The folder name increase by one each time the image number roll-over and recycle from the beginning