Is iPone 2.0 really coming in June 9th WWDC08?

I never bought the iPhone last year when it was released! Wy you say, because Apple and AT&T had it wrapped so hard that nothing was open or modifiable by the owner that I decided to go with N95-8G which has been working great for me for the past several months. Now there is talk of the new iPhone, possibly version 2.0. I am not convinced that the next release is truly version 2.0. If I deem it to be version 2.0, then I will place my order right there and then. But until then, I reserve judgement. Tho, I am excited...