Make var name use more consistent