Confusing titles when resolving a rebase or a merge conflict

The dialog used to resolve the conflicts refers to "Theirs - REMOTE" and "Mine - LOCAL". These titles are confusing. It will be much better instead of "REMOTE" and "LOCAL" to display the names of the branches to which each commit corresponds e.g. "Theirs - origin/master" and "Mine - branch123". If the merge/rebase operation was not done on a branch but on a particular commit then display the short commit hash.

When resolving conflicts involving stash pops the name of the window corresponding to the stash commit should be titled "stash" or "stash - STASH COMMIT MESSAGE HERE".

I have seen many times when "Mine" doesn't correspond to my changes and this adds even more to the confusion.