Change the capture names in HTML (SGML) comments.

Using 'comment' twice wasn't optimal.
Passing tests.