changed some more variable names, again to make clear their purpose