Yeah, Whiplash and Black Widow. It's my understanding (note that this is a Batman nerd pretending to know anything about Iron Man beyond the first film) that Black Widow is more of a Catwoman-y type character than anything else. I COULD BE WRONG THOUGH.
You can see both in the trailer (Whiplash is Mickey Rourke, Black Widow is Scarlett Johansson).