Replace pairs in validator's messages
Merge pull request #1651 from mruz/2.0.0

Replace pairs in validator's messages