Make vars passed to the templates more consistent