AVALANCHE: Do renaming/refactoring in Lucerna.