Shortening names to use M2M/M2L/L2L terminology