Shorten some legacy variables

This will make it easier to put on a slide.