HV-373 Making names dash-separated in order to be consistent with existing element/attribute names