Changed a bit of naming of variable