PIM-2531: Properly naming filters related objects