WCM-213 Rename
WCM-230 SF
WCM-244
WCM-244 Fix Analytics Test