changed rule name macros
fixed the errata
another fix for errata
Merge pull request #725 from EgbertRijke/rulenames

changed rule name macros