Issue #2282653: replaced _ with - in CSS ids and classes