Fixing compatibility with protopigeon 2
One more time: proper field names for new protopigeon