More consistent variable names.