Who Was Simon Peter's (r.a.) Father?

بِسۡمِ ٱللهِ ٱلرَّحۡمَـٰنِ ٱلرَّحِيمِ 

There is a discrepancy regarding the name of Simon Peter’s father.  In the Gospel according to John, we have this: 

John 21:15

¹⁵ And when they had eaten, Jesus said to Simon Peter, Simon, son of John, “Dost thou care for me more than these others?”  “Yes, Lord,” he told him, “thou knowest well that I love thee.” And he said to him, “Feed my lambs.” 

¹⁵ Ὅτε οὖν ἠρίστησαν, λέγει τῷ Σίμωνι Πέτρῳ ὁ Ἰησοῦς, Σίμων Ἰωάννου,  ἀγαπᾷς με πλέον τούτων; λέγει αὐτῷ: ναί κύριε, σὺ οἶδας ὅτι φιλῶ σε.  λέγει αὐτῷ: βόσκε τὰ ἀρνία μου. 

¹⁵ Cum ergo prandissent, dicit Simoni Petro Jesus: Simon Joannis, diligis me plus his?  Dicit ei: Etiam Domine, tu scis quia amo te.  Dicit ei: Pasce agnos meos. 

But then, in the Gospel according to Matthew, we have this: 

Matthew 16:17

¹⁷ And Jesus answered him, “Blessed art thou, Simon, son of Jonah; it is not flesh and blood, it is my Father in Heaven that has Revealed this to thee.” 

¹⁷ ἀποκριθεὶς δὲ ὁ Ἰησοῦς εἶπεν αὐτῷ: μακάριος εἶ, Σίμων Βαριωνᾶ, ὅτι σὰρξ καὶ αἷμα οὐκ ἀπεκάλυψέν σοι ἀλλ' ὁ πατήρ μου ὁ ἐν τοῖς οὐρανοῖς. 

¹⁷ Respondens autem Jesus, dixit ei: Beatus es Simon Bar Jona: quia caro et sanguis non revelavit tibi, sed Pater meus, qui in cælis est. 

The discrepancy is clearer in the Greek, and Latin text; “John”, and “Jonah”, are distinct.