BNF Update

simplified with more descriptive names