De-Pin a headlight switch connector

I have searched the internet and I found this:
Mopar Male Female 12 AWG Gauge Wire Wiring Harness Terminal Crimp Connectors NOS | eBay
These are the right ones? The gauge wires are same as the light switch wires thats no question.

I have also found this:
Female Spade Terminal Set (5x) : 14-12 Gauge

The second link looks closer to the type. The first link looks like the type you'd use in the bulkhead connector. The end of the female connector looks different if you compare it to your pictures.