Minor variable renaming to avoid name clashes in tests.