Changed third batch of variable names