If you're not going the "cattle" route (see other comments), I think the best strategy is to have a unique name "olympus" or whatever, and then use role aliases

If you're not going the "cattle" route (see other comments), I think the best strategy is to have a unique name "olympus" or whatever, and then use role aliases. That means if you take olympus and repurpose it from webserving, you still know which computer it actually is, but you swap the roles around so that when you just want to connect to the mail server, you can do that via the alias.