The origanal term "Bull & Terrier", the common 'Pitt Bull" or the politically Correct American Staffordshire Terrier, are what they are today and were what they were back then. I find it rather perverse to try to "sugar coat" the dogs history.
Sugar coat? I guess it wouldn't matter to you that I have spoken to people who are in the business of keeping sheep and ducks for the purpose of herding. They have agreed with me that it is a sad thing that the use for fighting has outweighed the original use of a farm dog.
To go even further, Mastiff breeds in general were originally used for herding and guarding livestock. The Rottweiler were originally bred to be cart pulling dogs. That is the reason why their tails were docked, so they wouldn't get caught in the wheels and axels.