Changed variable names to match test cases