(PDB-663) deal with the termini being renamed

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