re #163: Fix variable names