Added hyphens to non-terminal