Fix misleading variable names.