You can change the mustache that handles the model naming. Not easy but this would be a good alternative as opposed getting rid of it.
I have never seed names like this. Maybe you have some other mistakes that confuse the generator to add the number sufix ?