AVALANCHE: Do renaming/refactoring in Graphics.