Thor is his name and they played it off as being a title. Jeez. They really missed the mark on that one.

Because of the backlash, they didn't push forward with making her "Iron Man". Instead, they named her Ironheart who took over the Iron Man title in the comics while Tony Stark was in a coma. He's coming back soon, so I don't know how they would handle that. Probably a mentor-student relationship.