Had to do this manually, because this `name`->`pname` "refactoring" makes automated backports impossible. Changes: 08450562e5...9c707dc32a (cherry picked from commit bee0468d7ba37fffc19d509eaffdd49bf30ed9e1)
08450562e5...9c707dc32a