Fix #203: Fix names of variables and functions