Use consistent naming in l2 suite