Good question whether we want to have consistent naming vs. correct naming, because a few lines below this wrong name just propagated deeper. It's probably not part of this PR, however since this task got much more time than what it should take, perhaps it wouldn't be a bad idea to refactor the naming to be correct?