PIM-3318 : rename long variable