change m1 and m2 to full names, use new cvlsshutils