redone port names
portnode cleanup #1
portnode cleanup #2
changed define