WIP: fix grading: fix var names