AVALANCHE: Get rid of Enhanced. Further renamings and refactoring in Avalanche and Avalot.