I changed some variable names to make them comply with naming conventions.

Some lines of code are longer than 80 characters, so I will sort them
out before making a pull request.