Switch from dashes to underscores to keep Javascript happy - fixes #802
  (also matches the style of all the other IDs)