refactoring naming in hashtable