Use consistent naming in ha l3 suite