Cleanup of variable naming and consts.

I agree. Also, this is in transition and we need to improve how we can catch ugly comments with e.g. code reviews like @toxeus suggested. For now I make small incremental changes to what is so it's easy to follow. The goal is that the end result doesn't have comments in places like this. Many more commits on the way.