I've bought a Touch to replace my Classic, but iTunes sometimes called it a iPod, sometimes a iPhone! Come on Apple - the iPod Touch and the iPhone are 2 different devices!
And as for asking us for 6 quid for a firmware upgrade - don't get me going!