Minor naming changes of variables.