They have both of the terminals for the bulkhead and the bulkhead connector. My NAPA has them hanging on the wiring display rack.

I forgot the part numbers but if I get a chance to go by their today I will get it.