Rename Horn to Comments

This is an alternate proposal to #1776 for dealing with #1466.