Bug #1915: Add $NAME to context parser