MORTEVIELLE: Some more renaming