My personal headcanon is that Mentor from the old series was actually supposed to be
Mentor (since he said Mentor was his actual name, and he claimed to be old enough to teach archery to Cupid).
Anyway, as much as I love Captain Marvel, I'm not looking forward to anything involving "Shazam" (a character who bears only a superficial resemblance to Captain Marvel), including this movie.