Fix ParserParameter names/class

This won't change any inherent logic but it makes naming more
consistent and prepares for [1] in 1.10

[1] https://gerrit.wikimedia.org/r/#/c/52598

Change-Id: I03da66fc99f2bd1962d9eb8d93119ac70f3deccd