Fix other programs that used the old spanning-tree semantics

also change the names to clarify.