BUG-1120: Rename to GenerationalListenerMap