Changed some variable names.

For better self-documentation.