Modified hash table type names. Converted some ints to TInts.