Rename class-rulename to cat-rulename in bnf-files Fix #46