My feeling, though, is that you care more about the function of a machine than the physical machine itself. Why not change the machine name when you change it’s purpose? There is no reason you need to know that the current prod web server used to be the dev server.