PIM-3196: rename things properly