Change back to using grammar name

Matching against the scope name of the grammar didn't seem to work in
all cases.