CGE2: Some renaming in V3D and V2D.