Changes to hnat, mostly replacing names with notations
Some more cosmetic changes to hnat