Changed first batch of variable names