Fixes for CP renamer PP call using API