I just installed these, and they are the correct fit:
https://www.ebay.com/itm/371136207437

Interestingly enough, the part number on this one is the exact number than on the one I installed earlier that was too long. The difference is the manufacturer, the first one was Needa 38523, and the second one Dorman 38523. No wonder there's confusion...
RockAuto sells the incorrect one (Needa), and as Roy pointed out, you can get the correct one form Autozone.
https://www.autozone.com/collision-b...415909_53700_0

Here's the packaging on both, with the same part number... and also the different cables next to each other, the one on top is the Needa, the middle one the original, and the bottom one the Dorman.
So anyone looking to replace their cables on a 2nd gen, you want the Dorman 38523
IMG_8309.jpgIMG_8307.jpg