Updated a few variable names to be more clear.