Class Name changes - Added on behalf of Hitesh