You are correct about the former USS Iwo Jima (LPH-2), a ship that I knew very well decades ago. But you might not realize a new Wasp-class USS Iwo Jima (LHD-7) was commissioned in 2001. She's the seventh of eight Wasp-class Landing Helicopter Dock amphibious warfare vessels that are essentially small aircraft carriers with flooding well decks for amphibious landing craft in addition to helicopters and F-35 jets.
(As I said, I'm showing my age here.)