AVALANCHE: Some renaming.