Changed a few variable names to be semantically ok