In D10662#309232, @kamil wrote:

Using deviceID everywhere makes me sometimes confused which ID it is, so in places like this I would prefer recipientDeviceID or targetDeviceID but curious about what other reviewers think.

I did the same here D10381 so going to update next time touching this code.

For notfis, it might make sense to have a keyserverID for now - https://phab.comm.dev/D10660#309743