Improving names of our syntax types.