Windows Vista + 1 will be "Windows 7"

Windows Vista will be replaced by; 

Windows Vista Team Blog : Introducing Windows 7

I actually prefer the simplicity of numbering, be it year or version based, if only to avoid the mapping of names to releases. The only odd comment in the post;

And since we do not ship new versions of Windows every year, using a date did not make sense."

So, will the next Windows Server drop its date based naming?

PS: I'm still on XP so maybe Vista won't happen: XP + 1 = Windows 7?