Rename grader_id to grade_id