diff --git a/misc/qubes-trigger-sync-appmenus.sh b/misc/qubes-trigger-sync-appmenus.sh
index e848ea3..c45428f 100755
--- a/misc/qubes-trigger-sync-appmenus.sh
+++ b/misc/qubes-trigger-sync-appmenus.sh
@@ -3,5 +3,5 @@
 UPDATEABLE=`/usr/bin/xenstore-read qubes_vm_updateable`
 
 if [ "$UPDATEABLE" = "True" ]; then
-    /usr/lib/qubes/qrexec_client_vm dom0 qubes.SyncAppMenus /bin/sh /etc/qubes_rpc/qubes.GetAppmenus
+    /usr/lib/qubes/qrexec_client_vm dom0 qubes.SyncAppMenus /bin/sh /etc/qubes-rpc/qubes.GetAppmenus
 fi
diff --git a/qubes_rpc/.gitignore b/qubes-rpc/.gitignore
similarity index 100%
rename from qubes_rpc/.gitignore
rename to qubes-rpc/.gitignore
diff --git a/qubes_rpc/Makefile b/qubes-rpc/Makefile
similarity index 74%
rename from qubes_rpc/Makefile
rename to qubes-rpc/Makefile
index a592d1c..235c22c 100644
--- a/qubes_rpc/Makefile
+++ b/qubes-rpc/Makefile
@@ -5,9 +5,9 @@ vm-file-editor: vm-file-editor.o ioall.o
 	$(CC) -pie -g -o $@ $^
 qopen-in-vm: qopen-in-vm.o ioall.o gui-fatal.o
 	$(CC) -pie -g -o $@ $^
-qfile-agent: qfile-agent.o ioall.o gui-fatal.o copy_file.o crc32.o
+qfile-agent: qfile-agent.o ioall.o gui-fatal.o copy-file.o crc32.o
 	$(CC) -pie -g -o $@ $^
-qfile-unpacker: qfile-unpacker.o ioall.o gui-fatal.o copy_file.o unpack.o crc32.o
+qfile-unpacker: qfile-unpacker.o ioall.o gui-fatal.o copy-file.o unpack.o crc32.o
 	$(CC) -pie -g -o $@ $^
 
 clean:
diff --git a/qubes_rpc/copy_file.c b/qubes-rpc/copy-file.c
similarity index 100%
rename from qubes_rpc/copy_file.c
rename to qubes-rpc/copy-file.c
diff --git a/qubes_rpc/crc32.c b/qubes-rpc/crc32.c
similarity index 100%
rename from qubes_rpc/crc32.c
rename to qubes-rpc/crc32.c
diff --git a/qubes_rpc/crc32.h b/qubes-rpc/crc32.h
similarity index 100%
rename from qubes_rpc/crc32.h
rename to qubes-rpc/crc32.h
diff --git a/qubes_rpc/dvm2.h b/qubes-rpc/dvm2.h
similarity index 100%
rename from qubes_rpc/dvm2.h
rename to qubes-rpc/dvm2.h
diff --git a/qubes_rpc/filecopy.h b/qubes-rpc/filecopy.h
similarity index 100%
rename from qubes_rpc/filecopy.h
rename to qubes-rpc/filecopy.h
diff --git a/qubes_rpc/gui-fatal.c b/qubes-rpc/gui-fatal.c
similarity index 100%
rename from qubes_rpc/gui-fatal.c
rename to qubes-rpc/gui-fatal.c
diff --git a/qubes_rpc/gui-fatal.h b/qubes-rpc/gui-fatal.h
similarity index 100%
rename from qubes_rpc/gui-fatal.h
rename to qubes-rpc/gui-fatal.h
diff --git a/qubes_rpc/ioall.c b/qubes-rpc/ioall.c
similarity index 100%
rename from qubes_rpc/ioall.c
rename to qubes-rpc/ioall.c
diff --git a/qubes_rpc/ioall.h b/qubes-rpc/ioall.h
similarity index 100%
rename from qubes_rpc/ioall.h
rename to qubes-rpc/ioall.h
diff --git a/qubes_rpc/prepare-suspend b/qubes-rpc/prepare-suspend
similarity index 100%
rename from qubes_rpc/prepare-suspend
rename to qubes-rpc/prepare-suspend
diff --git a/qubes_rpc/qfile-agent.c b/qubes-rpc/qfile-agent.c
similarity index 100%
rename from qubes_rpc/qfile-agent.c
rename to qubes-rpc/qfile-agent.c
diff --git a/qubes_rpc/qfile-unpacker.c b/qubes-rpc/qfile-unpacker.c
similarity index 100%
rename from qubes_rpc/qfile-unpacker.c
rename to qubes-rpc/qfile-unpacker.c
diff --git a/qubes_rpc/qopen-in-vm.c b/qubes-rpc/qopen-in-vm.c
similarity index 100%
rename from qubes_rpc/qopen-in-vm.c
rename to qubes-rpc/qopen-in-vm.c
diff --git a/qubes_rpc/qrun-in-vm b/qubes-rpc/qrun-in-vm
similarity index 100%
rename from qubes_rpc/qrun-in-vm
rename to qubes-rpc/qrun-in-vm
diff --git a/qubes_rpc/qubes.Filecopy b/qubes-rpc/qubes.Filecopy
similarity index 100%
rename from qubes_rpc/qubes.Filecopy
rename to qubes-rpc/qubes.Filecopy
diff --git a/qubes_rpc/qubes.Filecopy.policy b/qubes-rpc/qubes.Filecopy.policy
similarity index 100%
rename from qubes_rpc/qubes.Filecopy.policy
rename to qubes-rpc/qubes.Filecopy.policy
diff --git a/qubes_rpc/qubes.GetAppmenus b/qubes-rpc/qubes.GetAppmenus
similarity index 100%
rename from qubes_rpc/qubes.GetAppmenus
rename to qubes-rpc/qubes.GetAppmenus
diff --git a/qubes_rpc/qubes.OpenInVM b/qubes-rpc/qubes.OpenInVM
similarity index 100%
rename from qubes_rpc/qubes.OpenInVM
rename to qubes-rpc/qubes.OpenInVM
diff --git a/qubes_rpc/qubes.OpenInVM.policy b/qubes-rpc/qubes.OpenInVM.policy
similarity index 100%
rename from qubes_rpc/qubes.OpenInVM.policy
rename to qubes-rpc/qubes.OpenInVM.policy
diff --git a/qubes_rpc/qubes.SuspendPost b/qubes-rpc/qubes.SuspendPost
similarity index 100%
rename from qubes_rpc/qubes.SuspendPost
rename to qubes-rpc/qubes.SuspendPost
diff --git a/qubes_rpc/qubes.SuspendPre b/qubes-rpc/qubes.SuspendPre
similarity index 100%
rename from qubes_rpc/qubes.SuspendPre
rename to qubes-rpc/qubes.SuspendPre
diff --git a/qubes_rpc/qubes.SyncNtpClock b/qubes-rpc/qubes.SyncNtpClock
similarity index 100%
rename from qubes_rpc/qubes.SyncNtpClock
rename to qubes-rpc/qubes.SyncNtpClock
diff --git a/qubes_rpc/qubes.VMShell b/qubes-rpc/qubes.VMShell
similarity index 100%
rename from qubes_rpc/qubes.VMShell
rename to qubes-rpc/qubes.VMShell
diff --git a/qubes_rpc/qubes.VMShell.policy b/qubes-rpc/qubes.VMShell.policy
similarity index 100%
rename from qubes_rpc/qubes.VMShell.policy
rename to qubes-rpc/qubes.VMShell.policy
diff --git a/qubes_rpc/qubes.WaitForSession b/qubes-rpc/qubes.WaitForSession
similarity index 100%
rename from qubes_rpc/qubes.WaitForSession
rename to qubes-rpc/qubes.WaitForSession
diff --git a/qubes_rpc/qvm-copy-gnome.desktop b/qubes-rpc/qvm-copy-gnome.desktop
similarity index 100%
rename from qubes_rpc/qvm-copy-gnome.desktop
rename to qubes-rpc/qvm-copy-gnome.desktop
diff --git a/qubes_rpc/qvm-copy-to-vm b/qubes-rpc/qvm-copy-to-vm
similarity index 100%
rename from qubes_rpc/qvm-copy-to-vm
rename to qubes-rpc/qvm-copy-to-vm
diff --git a/qubes_rpc/qvm-copy-to-vm.gnome b/qubes-rpc/qvm-copy-to-vm.gnome
similarity index 100%
rename from qubes_rpc/qvm-copy-to-vm.gnome
rename to qubes-rpc/qvm-copy-to-vm.gnome
diff --git a/qubes_rpc/qvm-copy-to-vm.kde b/qubes-rpc/qvm-copy-to-vm.kde
similarity index 100%
rename from qubes_rpc/qvm-copy-to-vm.kde
rename to qubes-rpc/qvm-copy-to-vm.kde
diff --git a/qubes_rpc/qvm-copy.desktop b/qubes-rpc/qvm-copy.desktop
similarity index 100%
rename from qubes_rpc/qvm-copy.desktop
rename to qubes-rpc/qvm-copy.desktop
diff --git a/qubes_rpc/qvm-dvm-gnome.desktop b/qubes-rpc/qvm-dvm-gnome.desktop
similarity index 100%
rename from qubes_rpc/qvm-dvm-gnome.desktop
rename to qubes-rpc/qvm-dvm-gnome.desktop
diff --git a/qubes_rpc/qvm-dvm.desktop b/qubes-rpc/qvm-dvm.desktop
similarity index 100%
rename from qubes_rpc/qvm-dvm.desktop
rename to qubes-rpc/qvm-dvm.desktop
diff --git a/qubes_rpc/qvm-mru-entry b/qubes-rpc/qvm-mru-entry
similarity index 100%
rename from qubes_rpc/qvm-mru-entry
rename to qubes-rpc/qvm-mru-entry
diff --git a/qubes_rpc/qvm-open-in-dvm b/qubes-rpc/qvm-open-in-dvm
similarity index 96%
rename from qubes_rpc/qvm-open-in-dvm
rename to qubes-rpc/qvm-open-in-dvm
index 2e04aaf..95584fe 100755
--- a/qubes_rpc/qvm-open-in-dvm
+++ b/qubes-rpc/qvm-open-in-dvm
@@ -25,7 +25,7 @@ if ! [ $# = 1 ] ; then
 	exit 1
 fi
 
-. /usr/lib/qubes/wrap_in_html_if_url.sh
+. /usr/lib/qubes/wrap-in-html-if-url.sh
 wrap_in_html_if_url "$1"
 
 exec /usr/lib/qubes/qrexec_client_vm '$dispvm' qubes.OpenInVM "/usr/lib/qubes/qopen-in-vm" "$FILE_ARGUMENT"
diff --git a/qubes_rpc/qvm-open-in-vm b/qubes-rpc/qvm-open-in-vm
similarity index 100%
rename from qubes_rpc/qvm-open-in-vm
rename to qubes-rpc/qvm-open-in-vm
diff --git a/qubes_rpc/qvm-run b/qubes-rpc/qvm-run
similarity index 100%
rename from qubes_rpc/qvm-run
rename to qubes-rpc/qvm-run
diff --git a/qubes_rpc/sync-ntp-clock b/qubes-rpc/sync-ntp-clock
similarity index 100%
rename from qubes_rpc/sync-ntp-clock
rename to qubes-rpc/sync-ntp-clock
diff --git a/qubes_rpc/unpack.c b/qubes-rpc/unpack.c
similarity index 100%
rename from qubes_rpc/unpack.c
rename to qubes-rpc/unpack.c
diff --git a/qubes_rpc/vm-file-editor.c b/qubes-rpc/vm-file-editor.c
similarity index 100%
rename from qubes_rpc/vm-file-editor.c
rename to qubes-rpc/vm-file-editor.c
diff --git a/qubes_rpc/wrap_in_html_if_url.sh b/qubes-rpc/wrap-in-html-if-url.sh
similarity index 100%
rename from qubes_rpc/wrap_in_html_if_url.sh
rename to qubes-rpc/wrap-in-html-if-url.sh
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 9c54f10..e8137fb 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -71,7 +71,7 @@ ln -sf . %{name}-%{version}
 %setup -T -D
 
 %build
-for dir in qubes_rpc misc; do
+for dir in qubes-rpc misc; do
   (cd $dir; make)
 done
 
@@ -168,23 +168,23 @@ install network/qubes-netwatcher $RPM_BUILD_ROOT/usr/sbin/
 
 install -d $RPM_BUILD_ROOT/usr/bin
 
-install qubes_rpc/{qvm-open-in-dvm,qvm-open-in-vm,qvm-copy-to-vm,qvm-run,qvm-mru-entry} $RPM_BUILD_ROOT/usr/bin
-install qubes_rpc/wrap_in_html_if_url.sh $RPM_BUILD_ROOT/usr/lib/qubes
-install qubes_rpc/qvm-copy-to-vm.kde $RPM_BUILD_ROOT/usr/lib/qubes
-install qubes_rpc/qvm-copy-to-vm.gnome $RPM_BUILD_ROOT/usr/lib/qubes
-install qubes_rpc/{vm-file-editor,qfile-agent,qopen-in-vm,qfile-unpacker} $RPM_BUILD_ROOT/usr/lib/qubes
-install qubes_rpc/qrun-in-vm $RPM_BUILD_ROOT/usr/lib/qubes
-install qubes_rpc/sync-ntp-clock $RPM_BUILD_ROOT/usr/lib/qubes
-install qubes_rpc/prepare-suspend $RPM_BUILD_ROOT/usr/lib/qubes
+install qubes-rpc/{qvm-open-in-dvm,qvm-open-in-vm,qvm-copy-to-vm,qvm-run,qvm-mru-entry} $RPM_BUILD_ROOT/usr/bin
+install qubes-rpc/wrap-in-html-if-url.sh $RPM_BUILD_ROOT/usr/lib/qubes
+install qubes-rpc/qvm-copy-to-vm.kde $RPM_BUILD_ROOT/usr/lib/qubes
+install qubes-rpc/qvm-copy-to-vm.gnome $RPM_BUILD_ROOT/usr/lib/qubes
+install qubes-rpc/{vm-file-editor,qfile-agent,qopen-in-vm,qfile-unpacker} $RPM_BUILD_ROOT/usr/lib/qubes
+install qubes-rpc/qrun-in-vm $RPM_BUILD_ROOT/usr/lib/qubes
+install qubes-rpc/sync-ntp-clock $RPM_BUILD_ROOT/usr/lib/qubes
+install qubes-rpc/prepare-suspend $RPM_BUILD_ROOT/usr/lib/qubes
 install -d $RPM_BUILD_ROOT/%{kde_service_dir}
-install -m 0644 qubes_rpc/{qvm-copy.desktop,qvm-dvm.desktop} $RPM_BUILD_ROOT/%{kde_service_dir}
-install -d $RPM_BUILD_ROOT/etc/qubes_rpc
-install -m 0644 qubes_rpc/{qubes.Filecopy,qubes.OpenInVM,qubes.VMShell,qubes.SyncNtpClock} $RPM_BUILD_ROOT/etc/qubes_rpc
-install -m 0644 qubes_rpc/{qubes.SuspendPre,qubes.SuspendPost,qubes.GetAppmenus} $RPM_BUILD_ROOT/etc/qubes_rpc
-install -m 0644 qubes_rpc/qubes.WaitForSession $RPM_BUILD_ROOT/etc/qubes_rpc
+install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-dvm.desktop} $RPM_BUILD_ROOT/%{kde_service_dir}
+install -d $RPM_BUILD_ROOT/etc/qubes-rpc
+install -m 0644 qubes-rpc/{qubes.Filecopy,qubes.OpenInVM,qubes.VMShell,qubes.SyncNtpClock} $RPM_BUILD_ROOT/etc/qubes-rpc
+install -m 0644 qubes-rpc/{qubes.SuspendPre,qubes.SuspendPost,qubes.GetAppmenus} $RPM_BUILD_ROOT/etc/qubes-rpc
+install -m 0644 qubes-rpc/qubes.WaitForSession $RPM_BUILD_ROOT/etc/qubes-rpc
 
 install -d $RPM_BUILD_ROOT/usr/share/file-manager/actions
-install -m 0644 qubes_rpc/*-gnome.desktop $RPM_BUILD_ROOT/usr/share/file-manager/actions
+install -m 0644 qubes-rpc/*-gnome.desktop $RPM_BUILD_ROOT/usr/share/file-manager/actions
 
 install -D misc/nautilus-actions.conf $RPM_BUILD_ROOT/etc/xdg/nautilus-actions/nautilus-actions.conf
 
@@ -377,15 +377,14 @@ rm -f %{name}-%{version}
 /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*
 /etc/polkit-1/localauthority/50-local.d/qubes-allow-all.pkla
 /etc/polkit-1/rules.d/00-qubes-allow-all.rules
-%dir /etc/qubes_rpc
-/etc/qubes_rpc/qubes.Filecopy
-/etc/qubes_rpc/qubes.OpenInVM
-/etc/qubes_rpc/qubes.GetAppmenus
-/etc/qubes_rpc/qubes.VMShell
-/etc/qubes_rpc/qubes.SyncNtpClock
-/etc/qubes_rpc/qubes.SuspendPre
-/etc/qubes_rpc/qubes.SuspendPost
-/etc/qubes_rpc/qubes.WaitForSession
+/etc/qubes-rpc/qubes.Filecopy
+/etc/qubes-rpc/qubes.OpenInVM
+/etc/qubes-rpc/qubes.GetAppmenus
+/etc/qubes-rpc/qubes.VMShell
+/etc/qubes-rpc/qubes.SyncNtpClock
+/etc/qubes-rpc/qubes.SuspendPre
+/etc/qubes-rpc/qubes.SuspendPost
+/etc/qubes-rpc/qubes.WaitForSession
 /etc/sudoers.d/qubes
 %config(noreplace) /etc/sysconfig/iptables
 %config(noreplace) /etc/sysconfig/ip6tables
@@ -435,7 +434,7 @@ rm -f %{name}-%{version}
 /usr/lib/qubes/serial.conf
 /usr/lib/qubes/setup-ip
 /usr/lib/qubes/vm-file-editor
-/usr/lib/qubes/wrap_in_html_if_url.sh
+/usr/lib/qubes/wrap-in-html-if-url.sh
 /usr/lib/yum-plugins/yum-qubes-hooks.py*
 /usr/sbin/qubes-firewall
 /usr/sbin/qubes-netwatcher