Changed a couple of private variable names.