PIM-3131: Update specs and rename method