ꙮ tatybara ꙮ

I haven't replayed BotW's story since launch. I remember the final boss was Calamity Ganon though. I remember Zelda saying something like it gave its ability to reincarnate so it has enough power to defeat Link. Think its safe to assume Ganon wont be in TotK & Gannondorf will change into something else (assuming he's the final boss)?