track on estate name, not estate object
Revert "Reuse Channels"

This reverts commit ae9b62c27f0c15e270391f776301280e46b03462.