unified parser names
Merge upstream/master
tests for #66