[SPOILERS] DAE believe this about the Master Sword?

So, the Master Sword in Skyward Sword was originally the Goddess sword. Through getting the flames, Link (who Fi calls MASTER) collects the flames and turns it into the Master Sword. So it the sword named after (Master) Link?