Made one last change to prepare for merging.

Changed a couple variable names for clarification.

* Updated some variable names