[PLAT-5526] Class name changed for consistency