Cleanup of variable naming and consts.

Yes, it will be changed later. Missed it here.