Renamed variables to better match actual values

Ensuring consistency in naming of variables to match what values they
hold.