Changed forth batch of variable names