Updated some variable names

hopefully these new variable names make more sense when you read the
code.