Minor naming changes to support future addition of dynamic multicast group management.