That's been my understanding. I'm surprised, though, that I come across "tori" more often than "dori." In our dojo we use the latter and I was thrown off when reading "tori" in a book once.
Learning Japanese helps a lot when learning the names of techniques and understanding what seems inconsistent like the case with "tori" and "dori."
Many of the current Aikikai publications refer to 'Tori' as the person executing the technique... which makes me wonder about the usage of 'nage', which is still heard in many dojos... was this a recent change?