Replace var names

-- change var names to more accurately depict changes occuring.