diff --git a/cat/Makefile.am b/cat/Makefile.am
index b9df9cd65..78e9f1217 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -41,7 +41,7 @@ SHARED_SOURCE_FILES = \
 
 virt_cat_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
-	virt-cat.c
+	cat.c
 
 virt_cat_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
@@ -66,7 +66,7 @@ virt_cat_LDADD = \
 
 virt_filesystems_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
-	virt-filesystems.c
+	filesystems.c
 
 virt_filesystems_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
@@ -91,7 +91,7 @@ virt_filesystems_LDADD = \
 
 virt_ls_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
-	virt-ls.c
+	ls.c
 
 virt_ls_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
diff --git a/cat/virt-cat.c b/cat/cat.c
similarity index 100%
rename from cat/virt-cat.c
rename to cat/cat.c
diff --git a/cat/virt-filesystems.c b/cat/filesystems.c
similarity index 100%
rename from cat/virt-filesystems.c
rename to cat/filesystems.c
diff --git a/cat/virt-ls.c b/cat/ls.c
similarity index 100%
rename from cat/virt-ls.c
rename to cat/ls.c
diff --git a/edit/Makefile.am b/edit/Makefile.am
index 9d92be752..f1f709b44 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -37,7 +37,7 @@ SHARED_SOURCE_FILES = \
 
 virt_edit_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
-	virt-edit.c
+	edit.c
 
 virt_edit_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
diff --git a/edit/virt-edit.c b/edit/edit.c
similarity index 100%
rename from edit/virt-edit.c
rename to edit/edit.c
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index a5aa3c1ec..28423f86f 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -63,7 +63,7 @@ SHARED_SOURCE_FILES = \
 
 virt_inspector_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
-	virt-inspector.c
+	inspector.c
 
 virt_inspector_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
diff --git a/inspector/virt-inspector.c b/inspector/inspector.c
similarity index 100%
rename from inspector/virt-inspector.c
rename to inspector/inspector.c
diff --git a/po/POTFILES b/po/POTFILES
index 559dd2fb5..c3dc0402c 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,7 +1,7 @@
 align/scan.c
-cat/virt-cat.c
-cat/virt-filesystems.c
-cat/virt-ls.c
+cat/cat.c
+cat/filesystems.c
+cat/ls.c
 daemon/9p.c
 daemon/acl.c
 daemon/augeas.c
@@ -105,7 +105,7 @@ df/estimate-max-threads.c
 df/main.c
 df/output.c
 df/parallel.c
-edit/virt-edit.c
+edit/edit.c
 erlang/erl-guestfs-proto.c
 erlang/erl-guestfs.c
 fish/alloc.c
@@ -222,7 +222,7 @@ gobject/src/struct-version.c
 gobject/src/struct-xattr.c
 gobject/src/struct-xfsinfo.c
 gobject/src/tristate.c
-inspector/virt-inspector.c
+inspector/inspector.c
 java/com_redhat_et_libguestfs_GuestFS.c
 lua/lua-guestfs.c
 ocaml/guestfs-c-actions.c
@@ -233,8 +233,8 @@ perl/lib/Sys/Guestfs.pm
 php/extension/guestfs_php.c
 python/guestfs-py-byhand.c
 python/guestfs-py.c
+rescue/rescue.c
 rescue/test-virt-rescue.pl
-rescue/virt-rescue.c
 resize/progress-c.c
 resize/tty-c.c
 resize/uri-c.c
diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index 7d23ee267..e77170dee 100644
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs virt-rescue
-# Copyright (C) 2010-2012 Red Hat Inc.
+# Copyright (C) 2010-2013 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ SHARED_SOURCE_FILES = \
 
 virt_rescue_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
-	virt-rescue.c
+	rescue.c
 
 virt_rescue_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
diff --git a/rescue/virt-rescue.c b/rescue/rescue.c
similarity index 100%
rename from rescue/virt-rescue.c
rename to rescue/rescue.c