minor changes in variable/test names