Rename udpv4 -> udp & tcpv4 -> tcp everywhere