Changed variable names
Changed variable names