Well in the original story Rapunzel was named after the plant stolen from the witches garden, which was a kind of lettuce called Rapunzel.
the Brothers Grimm, the witch doesn't die under the rock. Her punishment for trying to kill Snow White is to dance in heated iron shoes until she faints and dies.
I would call them "classic" endings as opposed to "true" endings. They are true endings to the original stories, but the true ending of Disney movies are IN those movies.