Shift more internal ports to new interface