hashset + fix rename