Is there a way to have the terminal mark assume the mark of the wire that is connected to it?  I have seen mention of replacing the symbol tag to show the equipotential or wire mark.  This will represent correctly on the schematic.  Unfortunately it will not carry through to reports or terminal layouts.