Updated variables.

Easier to understand variable names.