PM / OPP: Rename routines specific to old bindings with _v1