Switched back to using the symbols for the machine/vm names