Who are the allies of katniss and peta in Catching Fire?

D3: Beetee and Wiress ( aka Nuts and Volts )
D4: Finnick and Mags
D7: Johanna
D7: Blight (He died before ever meeting up with Katniss. He hit the force field when the four of them (district3 tributes and Johanna) panicked in the rain of blood and got electrocuted)
D6: The female morphling (The woman saved Peeta from the mutt monkey and got a severe hole to the chest), the other one, I don't remember