PDB-455 Switch over to v4 api throughout in prep

Signed-off-by: Ken Barber <ken@bob.sh>