PVC now uses shortnames for node names, so ensure this is reflected in the default choices for some node-level commands.