diff --git a/scripts/fish/macemu b/scripts/fish/vm-macemu
similarity index 76%
rename from scripts/fish/macemu
rename to scripts/fish/vm-macemu
index 1607302..f82374e 100644
--- a/scripts/fish/macemu
+++ b/scripts/fish/vm-macemu
@@ -1,6 +1,6 @@
 # vim: syntax=fish:
 
-function macemu -d "Frontend to SheepShaver and BasiliskII" -a arch cfg
+function vm-macemu -d "Frontend to SheepShaver and BasiliskII" -a arch cfg
 	switch "$arch"
 		case m68k
 			set config ~/.basilisk_ii_prefs
@@ -22,4 +22,6 @@ function macemu -d "Frontend to SheepShaver and BasiliskII" -a arch cfg
 	$executable
 end
 
+complete -c vm-macemu -xa "(ls $_agw_dir_rc/virtual-machines/MacEmu)"
+
 ## EOF
diff --git a/scripts/fish/nextemu b/scripts/fish/vm-nextemu
similarity index 68%
rename from scripts/fish/nextemu
rename to scripts/fish/vm-nextemu
index 5b548a0..cfe8ba0 100644
--- a/scripts/fish/nextemu
+++ b/scripts/fish/vm-nextemu
@@ -1,6 +1,6 @@
 # vim: syntax=fish:
 
-function nextemu -d "Frontend to Previous" -a cfg
+function vm-nextemu -d "Frontend to Previous" -a cfg
 	set config ~/.previous/previous.cfg
 
 	touch $config
@@ -16,4 +16,6 @@ function nextemu -d "Frontend to Previous" -a cfg
 	Previous
 end
 
+complete -c vm-nextemu -xa "(ls $_agw_dir_rc/virtual-machines/NeXT)"
+
 ## EOF