A message object never has a name, so you will never be able to capture this.   What we should try to do is to find all of the instances in which this would be called and convert them to the appropriate device.  This may be the setby device or the destination device.