I got tired of finding the Shelby Mustangs under both Ford and Shelby, so I researched them to try and make sense of them. According to Wikipedia, from 1965-68 these were made in Shelby's own plants, and the 1969-70 models were made in the Ford plant in Los Angeles. The name "Mustang" only appears on promo material for early-1965 only, and never on the cars. Late-1965 and the rest of the years did not have "Mustang" on the promo material. Here's what I did:

I renamed all the 1965-68 models as brand-Shelby, model names-GT ### XX (with spaces)

For the 1969-70 models, brand-Ford, model name-Shelby GT ### xx (previously the Fords were GT###xx-without spaces; I took out the "Mustang")

I left the modern ones alone for now.

There are a couple changes we could make:

For 1965, change model name to Mustang GT ### xx, under Shelby brand

The 1968 promo material lists "Cobra" as part of the name. It's not listed in the other years that I found.

Include the 1969-70 models under the Shelby brand. I listed them as Fords since Shelby didn't assemble them.

Please let me know if we should name them some other way. Based on what I could find, I thought this was the best way to make it easier for everyone.