diff --git a/Makefile b/Makefile
index 53c872c..5e5a8d0 100644
--- a/Makefile
+++ b/Makefile
@@ -235,7 +235,7 @@ install-common:
 	install -d $(DESTDIR)$(BINDIR)
 	install -m 0755 misc/qubes-session-autostart $(DESTDIR)$(BINDIR)/qubes-session-autostart
 	install -m 0755 misc/qvm-features-request $(DESTDIR)$(BINDIR)/qvm-features-request
-	install qubes-rpc/{qvm-open-in-dvm,qvm-open-in-vm,qvm-copy-to-vm,qvm-run} $(DESTDIR)/usr/bin
+	install qubes-rpc/{qvm-open-in-dvm,qvm-open-in-vm,qvm-copy-to-vm,qvm-run-vm} $(DESTDIR)/usr/bin
 	ln -s qvm-copy-to-vm $(DESTDIR)/usr/bin/qvm-move-to-vm
 	install qubes-rpc/qvm-copy-to-vm.kde $(DESTDIR)$(LIBDIR)/qubes
 	install qubes-rpc/qvm-copy-to-vm.gnome $(DESTDIR)$(LIBDIR)/qubes
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index b4a6e01..2f2c07e 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -98,7 +98,7 @@ usr/bin/qvm-features-request
 usr/bin/qvm-move-to-vm
 usr/bin/qvm-open-in-dvm
 usr/bin/qvm-open-in-vm
-usr/bin/qvm-run
+usr/bin/qvm-run-vm
 usr/bin/xenstore-watch-qubes
 usr/lib/NetworkManager/conf.d/30-qubes.conf
 usr/lib/python2.7/dist-packages/qubesxdg.py
diff --git a/doc/vm-tools/qvm-run.rst b/doc/vm-tools/qvm-run-vm.rst
similarity index 71%
rename from doc/vm-tools/qvm-run.rst
rename to doc/vm-tools/qvm-run-vm.rst
index 5070acd..9182ef7 100644
--- a/doc/vm-tools/qvm-run.rst
+++ b/doc/vm-tools/qvm-run-vm.rst
@@ -1,14 +1,14 @@
-=======
-qvm-run
-=======
+==========
+qvm-run-vm
+==========
 
 NAME
 ====
-qvm-run - run a specified command in a specified VM
+qvm-run-vm - run a specified command in a specified VM
 
 SYNOPSIS
 ========
-| qvm-run vmname command [aguments]
+| qvm-run-vm vmname command [aguments]
 
 OPTIONS
 =======
diff --git a/qubes-rpc/qvm-run b/qubes-rpc/qvm-run-vm
similarity index 100%
rename from qubes-rpc/qvm-run
rename to qubes-rpc/qvm-run-vm
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 47d4363..8f6d76d 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -473,7 +473,7 @@ rm -f %{name}-%{version}
 /usr/bin/qvm-move-to-vm
 /usr/bin/qvm-open-in-dvm
 /usr/bin/qvm-open-in-vm
-/usr/bin/qvm-run
+/usr/bin/qvm-run-vm
 /usr/bin/qvm-features-request
 /usr/bin/xenstore-watch-qubes
 /usr/bin/qubes-desktop-run