Fix some misnomer vars