Daniel-
It seems to me that the more sane approach is to give all the machines descriptive names, such as "Dataserver", "webserver1", and "webserver2".
How dare you bring logic into this discussion! I vote that the new server should be called "Maverick", just to piss you off. ;-)
Regards,
Erik