Peer-to-Peer is dead, long live...what?

The phrase peer-to-peer, originally coined to describe Napster and related architectures, has been stretched to, and perhaps past the breaking point, to include distributed computing, instant messaging, and server-less groupware, as well as fuzzier ideas like peer-to-peer journalism, and even extensions of the existing client/server architecture in the form of the writeable web, web services, and dynamic DNS.

Is this tent too big? Is all of this distribution and decentralization part of something larger where file sharing and real-time XML message passing and commodity supercomputers come together in a giant grid, or is peer-to-peer just a buzzword too far, a cousin of phrases like 'interactivity' and 'multimedia', mere placeholders which only last for as long as it takes us to really understand what's going on?