Fix naming of variables.