diff --git a/runtest/net.nfs b/runtest/net.nfs
index 3461807cf..463c95c37 100644
--- a/runtest/net.nfs
+++ b/runtest/net.nfs
@@ -2,107 +2,107 @@
 #
 # PLEASE READ THE README FILE network/README.md BEFORE RUNNING THESE.
 #
-nfs3_01 nfs01.sh -v 3 -t udp
-nfs3t_01 nfs01.sh -v 3 -t tcp
-nfs4_01 nfs01.sh -v 4 -t tcp
-nfs41_01 nfs01.sh -v 4.1 -t tcp
-nfs42_01 nfs01.sh -v 4.2 -t tcp
-nfs3_ipv6_01 nfs01.sh -6 -v 3 -t udp
-nfs3t_ipv6_01 nfs01.sh -6 -v 3 -t tcp
-nfs4_ipv6_01 nfs01.sh -6 -v 4 -t tcp
-nfs41_ipv6_01 nfs01.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_01 nfs01.sh -6 -v 4.2 -t tcp
+nfs01_v30_ip4u nfs01.sh -v 3 -t udp
+nfs01_v30_ip4t nfs01.sh -v 3 -t tcp
+nfs01_v40_ip4t nfs01.sh -v 4 -t tcp
+nfs01_v41_ip4t nfs01.sh -v 4.1 -t tcp
+nfs01_v42_ip4t nfs01.sh -v 4.2 -t tcp
+nfs01_v30_ip6u nfs01.sh -6 -v 3 -t udp
+nfs01_v30_ip6t nfs01.sh -6 -v 3 -t tcp
+nfs01_v40_ip6t nfs01.sh -6 -v 4 -t tcp
+nfs01_v41_ip6t nfs01.sh -6 -v 4.1 -t tcp
+nfs01_v42_ip6t nfs01.sh -6 -v 4.2 -t tcp
 
-nfs3_02 nfs02.sh -v 3 -t udp
-nfs3t_02 nfs02.sh -v 3 -t tcp
-nfs4_02 nfs02.sh -v 4 -t tcp
-nfs41_02 nfs02.sh -v 4.1 -t tcp
-nfs42_02 nfs02.sh -v 4.2 -t tcp
-nfs3_ipv6_02 nfs02.sh -6 -v 3 -t udp
-nfs3t_ipv6_02 nfs02.sh -6 -v 3 -t tcp
-nfs4_ipv6_02 nfs02.sh -6 -v 4 -t tcp
-nfs41_ipv6_02 nfs02.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_02 nfs02.sh -6 -v 4.2 -t tcp
+nfs02_v30_ip4u nfs02.sh -v 3 -t udp
+nfs02_v30_ip4t nfs02.sh -v 3 -t tcp
+nfs02_v40_ip4t nfs02.sh -v 4 -t tcp
+nfs02_v41_ip4t nfs02.sh -v 4.1 -t tcp
+nfs02_v42_ip4t nfs02.sh -v 4.2 -t tcp
+nfs02_v30_ip6u nfs02.sh -6 -v 3 -t udp
+nfs02_v30_ip6t nfs02.sh -6 -v 3 -t tcp
+nfs02_v40_ip6t nfs02.sh -6 -v 4 -t tcp
+nfs02_v41_ip6t nfs02.sh -6 -v 4.1 -t tcp
+nfs02_v42_ip6t nfs02.sh -6 -v 4.2 -t tcp
 
-nfs3_03 nfs03.sh -v 3 -t udp
-nfs3t_03 nfs03.sh -v 3 -t tcp
-nfs4_03 nfs03.sh -v 4 -t tcp
-nfs41_03 nfs03.sh -v 4.1 -t tcp
-nfs42_03 nfs03.sh -v 4.2 -t tcp
-nfs3_ipv6_03 nfs03.sh -6 -v 3 -t udp
-nfs3t_ipv6_03 nfs03.sh -6 -v 3 -t tcp
-nfs4_ipv6_03 nfs03.sh -6 -v 4 -t tcp
-nfs41_ipv6_03 nfs03.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_03 nfs03.sh -6 -v 4.2 -t tcp
+nfs03_v30_ip4u nfs03.sh -v 3 -t udp
+nfs03_v30_ip4t nfs03.sh -v 3 -t tcp
+nfs03_v40_ip4t nfs03.sh -v 4 -t tcp
+nfs03_v41_ip4t nfs03.sh -v 4.1 -t tcp
+nfs03_v42_ip4t nfs03.sh -v 4.2 -t tcp
+nfs03_v30_ip6u nfs03.sh -6 -v 3 -t udp
+nfs03_v30_ip6t nfs03.sh -6 -v 3 -t tcp
+nfs03_v40_ip6t nfs03.sh -6 -v 4 -t tcp
+nfs03_v41_ip6t nfs03.sh -6 -v 4.1 -t tcp
+nfs03_v42_ip6t nfs03.sh -6 -v 4.2 -t tcp
 
-nfs3_04 nfs04.sh -v 3 -t udp
-nfs3t_04 nfs04.sh -v 3 -t tcp
-nfs4_04 nfs04.sh -v 4 -t tcp
-nfs41_04 nfs04.sh -v 4.1 -t tcp
-nfs42_04 nfs04.sh -v 4.2 -t tcp
-nfs3_ipv6_04 nfs04.sh -6 -v 3 -t udp
-nfs3t_ipv6_04 nfs04.sh -6 -v 3 -t tcp
-nfs4_ipv6_04 nfs04.sh -6 -v 4 -t tcp
-nfs41_ipv6_04 nfs04.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_04 nfs04.sh -6 -v 4.2 -t tcp
+nfs04_v30_ip4u nfs04.sh -v 3 -t udp
+nfs04_v30_ip4t nfs04.sh -v 3 -t tcp
+nfs04_v40_ip4t nfs04.sh -v 4 -t tcp
+nfs04_v41_ip4t nfs04.sh -v 4.1 -t tcp
+nfs04_v42_ip4t nfs04.sh -v 4.2 -t tcp
+nfs04_v30_ip6u nfs04.sh -6 -v 3 -t udp
+nfs04_v30_ip6t nfs04.sh -6 -v 3 -t tcp
+nfs04_v40_ip6t nfs04.sh -6 -v 4 -t tcp
+nfs04_v41_ip6t nfs04.sh -6 -v 4.1 -t tcp
+nfs04_v42_ip6t nfs04.sh -6 -v 4.2 -t tcp
 
-nfs3_05 nfs05.sh -v 3 -t udp
-nfs3t_05 nfs05.sh -v 3 -t tcp
-nfs4_05 nfs05.sh -v 4 -t tcp
-nfs41_05 nfs05.sh -v 4.1 -t tcp
-nfs42_05 nfs05.sh -v 4.2 -t tcp
-nfs3_ipv6_05 nfs05.sh -6 -v 3 -t udp
-nfs3t_ipv6_05 nfs05.sh -6 -v 3 -t tcp
-nfs4_ipv6_05 nfs05.sh -6 -v 4 -t tcp
-nfs41_ipv6_05 nfs05.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_05 nfs05.sh -6 -v 4.2 -t tcp
+nfs05_v30_ip4u nfs05.sh -v 3 -t udp
+nfs05_v30_ip4t nfs05.sh -v 3 -t tcp
+nfs05_v40_ip4t nfs05.sh -v 4 -t tcp
+nfs05_v41_ip4t nfs05.sh -v 4.1 -t tcp
+nfs05_v42_ip4t nfs05.sh -v 4.2 -t tcp
+nfs05_v30_ip6u nfs05.sh -6 -v 3 -t udp
+nfs05_v30_ip6t nfs05.sh -6 -v 3 -t tcp
+nfs05_v40_ip6t nfs05.sh -6 -v 4 -t tcp
+nfs05_v41_ip6t nfs05.sh -6 -v 4.1 -t tcp
+nfs05_v42_ip6t nfs05.sh -6 -v 4.2 -t tcp
 
-nfs01_06  nfs06.sh -v "3,3,3,4,4,4" -t "udp,udp,tcp,tcp,tcp,tcp"
-nfs02_06 nfs06.sh -v "3,4,4.1,4.2,4.2,4.2" -t "tcp,tcp,tcp,tcp,tcp,tcp"
-nfs03_ipv6_06 nfs06.sh -6 -v "4,4.1,4.1,4.2,4.2,4.2" -t "tcp,tcp,tcp,tcp,tcp,tcp"
+nfs06_v30_v40_ip4  nfs06.sh -v "3,3,3,4,4,4" -t "udp,udp,tcp,tcp,tcp,tcp"
+nfs06_vall_ip4t nfs02_06 nfs06.sh -v "3,4,4.1,4.2,4.2,4.2" -t "tcp,tcp,tcp,tcp,tcp,tcp"
+nfs06_v4x_ip6t nfs03_ipv6_06 nfs06.sh -6 -v "4,4.1,4.1,4.2,4.2,4.2" -t "tcp,tcp,tcp,tcp,tcp,tcp"
 
-nfs3_07 nfs07.sh -v 3 -t udp
-nfs3t_07 nfs07.sh -v 3 -t tcp
-nfs4_07 nfs07.sh -v 4 -t tcp
-nfs41_07 nfs07.sh -v 4.1 -t tcp
-nfs42_07 nfs07.sh -v 4.2 -t tcp
-nfs3_ipv6_07 nfs07.sh -6 -v 3 -t udp
-nfs3t_ipv6_07 nfs07.sh -6 -v 3 -t tcp
-nfs4_ipv6_07 nfs07.sh -6 -v 4 -t tcp
-nfs41_ipv6_07 nfs07.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_07 nfs07.sh -6 -v 4.2 -t tcp
+nfs07_v30_ip4u nfs07.sh -v 3 -t udp
+nfs07_v30_ip4t nfs07.sh -v 3 -t tcp
+nfs07_v40_ip4t nfs07.sh -v 4 -t tcp
+nfs07_v41_ip4t nfs07.sh -v 4.1 -t tcp
+nfs07_v42_ip4t nfs07.sh -v 4.2 -t tcp
+nfs07_v30_ip6u nfs07.sh -6 -v 3 -t udp
+nfs07_v30_ip6t nfs07.sh -6 -v 3 -t tcp
+nfs07_v40_ip6t nfs07.sh -6 -v 4 -t tcp
+nfs07_v41_ip6t nfs07.sh -6 -v 4.1 -t tcp
+nfs07_v42_ip6t nfs07.sh -6 -v 4.2 -t tcp
 
-nfs3_08 nfs08.sh -v 3 -t udp
-nfs3t_08 nfs08.sh -v 3 -t tcp
-nfs4_08 nfs08.sh -v 4 -t tcp
-nfs41_08 nfs08.sh -v 4.1 -t tcp
-nfs42_08 nfs08.sh -v 4.2 -t tcp
-nfs3_ipv6_08 nfs08.sh -6 -v 3 -t udp
-nfs3t_ipv6_08 nfs08.sh -6 -v 3 -t tcp
-nfs4_ipv6_08 nfs08.sh -6 -v 4 -t tcp
-nfs41_ipv6_08 nfs08.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_08 nfs08.sh -6 -v 4.2 -t tcp
+nfs08_v30_ip4u nfs08.sh -v 3 -t udp
+nfs08_v30_ip4t nfs08.sh -v 3 -t tcp
+nfs08_v40_ip4t nfs08.sh -v 4 -t tcp
+nfs08_v41_ip4t nfs08.sh -v 4.1 -t tcp
+nfs08_v42_ip4t nfs08.sh -v 4.2 -t tcp
+nfs08_v30_ip6u nfs08.sh -6 -v 3 -t udp
+nfs08_v30_ip6t nfs08.sh -6 -v 3 -t tcp
+nfs08_v40_ip6t nfs08.sh -6 -v 4 -t tcp
+nfs08_v41_ip6t nfs08.sh -6 -v 4.1 -t tcp
+nfs08_v42_ip6t nfs08.sh -6 -v 4.2 -t tcp
 
-nfslock3_01 nfslock01.sh -v 3 -t udp
-nfslock3t_01 nfslock01.sh -v 3 -t tcp
-nfslock4_01 nfslock01.sh -v 4 -t tcp
-nfslock41_01 nfslock01.sh -v 4.1 -t tcp
-nfslock42_01 nfslock01.sh -v 4.2 -t tcp
-nfslock3_ipv6_01 nfslock01.sh -6 -v 3 -t udp
-nfslock3t_ipv6_01 nfslock01.sh -6 -v 3 -t tcp
-nfslock4_ipv6_01 nfslock01.sh -6 -v 4 -t tcp
-nfslock41_ipv6_01 nfslock01.sh -6 -v 4.1 -t tcp
-nfslock42_ipv6_01 nfslock01.sh -6 -v 4.2 -t tcp
+nfslock01_v30_ip4u nfslock01.sh -v 3 -t udp
+nfslock01_v30_ip4t nfslock01.sh -v 3 -t tcp
+nfslock01_v40_ip4t nfslock01.sh -v 4 -t tcp
+nfslock01_v41_ip4t nfslock01.sh -v 4.1 -t tcp
+nfslock01_v42_ip4t nfslock01.sh -v 4.2 -t tcp
+nfslock01_v30_ip6u nfslock01.sh -6 -v 3 -t udp
+nfslock01_v30_ip6t nfslock01.sh -6 -v 3 -t tcp
+nfslock01_v40_ip6t nfslock01.sh -6 -v 4 -t tcp
+nfslock01_v41_ip6t nfslock01.sh -6 -v 4.1 -t tcp
+nfslock01_v42_ip6t nfslock01.sh -6 -v 4.2 -t tcp
 
-nfsstat3_01 nfsstat01.sh -v 3
+nfsstat01_v30 nfsstat01.sh -v 3
 
-nfsx3 fsx.sh -v 3 -t udp
-nfsx3t fsx.sh -v 3 -t tcp
-nfsx4 fsx.sh -v 4 -t tcp
-nfsx41 fsx.sh -v 4.1 -t tcp
-nfsx42 fsx.sh -v 4.2 -t tcp
-nfsx3_ipv6 fsx.sh -6 -v 3 -t udp
-nfsx3t_ipv6 fsx.sh -6 -v 3 -t tcp
-nfsx4_ipv6 fsx.sh -6 -v 4 -t tcp
-nfsx41_ipv6 fsx.sh -6 -v 4.1 -t tcp
-nfsx42_ipv6 fsx.sh -6 -v 4.2 -t tcp
+fsx_v30_ip4u fsx.sh -v 3 -t udp
+fsx_v30_ip4t fsx.sh -v 3 -t tcp
+fsx_v40_ip4t fsx.sh -v 4 -t tcp
+fsx_v41_ip4t fsx.sh -v 4.1 -t tcp
+fsx_v42_ip4t fsx.sh -v 4.2 -t tcp
+fsx_v30_ip6u fsx.sh -6 -v 3 -t udp
+fsx_v30_ip6t fsx.sh -6 -v 3 -t tcp
+fsx_v40_ip6t fsx.sh -6 -v 4 -t tcp
+fsx_v41_ip6t fsx.sh -6 -v 4.1 -t tcp
+fsx_v42_ip6t fsx.sh -6 -v 4.2 -t tcp
