MORTEVIELLE: Fix shadowed variable. Thanks LordHoto for pointing out
MORTEVIELLE: Some renaming