Minor change of variables names.