Use consistent naming in ha l2 suite