PIM-3551 : naming