Reflect the true nature of a var through a better name

TBR: @terrylucas