Refactor DictionaryTree to use more general naming