PIM-2919 : rename classes