Naming Refactor and switch to AVLTree