rename variables to cut OCLint warnings
use proper interface of HashTable, use prefix increment