Board Thread:Questions and Answers/@comment-37441959-20190702220023/@comment-37597107-20190714230054

If you take a look on more songs, you'll notice many interessting things for example:

Bonetrousle and Death by Glamour have the same structure.

Live report is Undynes leitmotiv.

Battle Against a True Hero is has parts from An Ending.

So, I think your right,