That appears correct. I didn't remember which ship, and didn't bother to look it up at the time. It was my understanding that the Kitty Hawk would stay in service until the Bush was ready for service, but I thought that that would be in 2008. It looks like the Bush now is set for commissioning in 2009, and won't be ready for duty until 2010. It appears that the changeover in Japan is scheduled for next year, so the Kitty Hawk may end its career in limited service stateside. Jacksonville should probably make a try for it.
I heard she's going to stay in Bremerton.