diff --git a/repos/ports/run/netperf_lwip_usb30.run b/repos/ports/run/netperf_lwip_usb.run
similarity index 100%
rename from repos/ports/run/netperf_lwip_usb30.run
rename to repos/ports/run/netperf_lwip_usb.run
diff --git a/repos/ports/run/netperf_lxip_usb30.run b/repos/ports/run/netperf_lxip_usb.run
similarity index 100%
rename from repos/ports/run/netperf_lxip_usb30.run
rename to repos/ports/run/netperf_lxip_usb.run
diff --git a/tool/autopilot.list b/tool/autopilot.list
index b5730113ee..1775b3e0f7 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -29,11 +29,11 @@ migrate
 moon
 netperf_lwip
 netperf_lwip_bridge
-netperf_lwip_usb30
+netperf_lwip_usb
 netperf_lwip_wifi
 netperf_lxip
 netperf_lxip_bridge
-netperf_lxip_usb30
+netperf_lxip_usb
 netperf_lxip_wifi
 nic_bridge
 nic_bridge_stress