More tweaks

Some naming changes, plus get rid of __Pdo[L|Unl]ink.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
A few more fixes

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>