Obi-Wan and Qui-Gon shouldn’t be master/student as this contradicts what was stated in TESB but as friends or as two Jedi who work together with Yoda being the one who instructed Obi-Wan or both of them.
I’d rather change the Originals to not contradict the Prequels if the alternative is going through those mental gymnastics.