Yes, that included the presumed corroded terminal, i've got some good crimpers from Northern Tool, they've done good.
I'm kind of confused though, as all the wires go into a plastic connector with the male terminals on one side, Female terminals on the other,
Not quite sure how to remove it.