Added uniques hashmap to use sites, required for unique name generation.
Merge branch 'unique-namegen'