KFSTP-1597

Rename table for C&G Collection Activity as well as class, and related classes