Changed variable names