diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 89c94b33066d85ef5d983f4665bcd299f670ab95..335fa859129450b3ca9d3ab38d4c9c48faddad9e 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -2,7 +2,7 @@
 
 DAEMON_SOURCES =					\
 		event.c event.h				\
-		qemud.c qemud.h				\
+		libvirtd.c libvirtd.h			\
 		remote.c remote.h			\
 		dispatch.c dispatch.h			\
 		remote_dispatch_prototypes.h		\
diff --git a/daemon/dispatch.h b/daemon/dispatch.h
index 1d85df9a6b97742654084fe3e9b4932c55d1c5bb..30de65887bad96c9568f9b9e1e81a2fa91066107 100644
--- a/daemon/dispatch.h
+++ b/daemon/dispatch.h
@@ -25,7 +25,7 @@
 #define __LIBVIRTD_DISPATCH_H__
 
 
-#include "qemud.h"
+#include "libvirtd.h"
 
 
 int
diff --git a/daemon/qemud.c b/daemon/libvirtd.c
similarity index 99%
rename from daemon/qemud.c
rename to daemon/libvirtd.c
index 7cd190f3686acdad1a3ae51d7a701def39368587..7a256483505fbe719d9133c12e18186d416c7aa2 100644
--- a/daemon/qemud.c
+++ b/daemon/libvirtd.c
@@ -1,5 +1,5 @@
 /*
- * qemud.c: daemon start of day, guest process & i/o management
+ * libvirtd.c: daemon start of day, guest process & i/o management
  *
  * Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc.
  * Copyright (C) 2006 Daniel P. Berrange
@@ -53,7 +53,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
-#include "qemud.h"
+#include "libvirtd.h"
 #include "dispatch.h"
 
 #include "util.h"
diff --git a/daemon/qemud.h b/daemon/libvirtd.h
similarity index 99%
rename from daemon/qemud.h
rename to daemon/libvirtd.h
index e8ce20988ea7920f6bfa43c8ac905fb62b4f754f..241c637b4b15bf97af4ccbe8db36bd37aa51f422 100644
--- a/daemon/qemud.h
+++ b/daemon/libvirtd.h
@@ -1,5 +1,5 @@
 /*
- * qemud.h: daemon data structure definitions
+ * libvirtd.h: daemon data structure definitions
  *
  * Copyright (C) 2006-2009 Red Hat, Inc.
  * Copyright (C) 2006 Daniel P. Berrange
diff --git a/daemon/mdns.c b/daemon/mdns.c
index e1471af59cf8c69585fa16923c8d5b52ed473128..ae8dc40fdb563cf824c896d2032ad93581715c9a 100644
--- a/daemon/mdns.c
+++ b/daemon/mdns.c
@@ -37,8 +37,7 @@
 #include <avahi-common/error.h>
 #include <avahi-common/timeval.h>
 
-#include "internal.h"
-#include "qemud.h"
+#include "libvirtd.h"
 #include "mdns.h"
 #include "event.h"
 #include "memory.h"
diff --git a/daemon/remote.h b/daemon/remote.h
index e3ee6964cc40d614dab9813e7d710eba19c4dc7c..5df601bb9b973d94bfe36d59acc7658b04f351b5 100644
--- a/daemon/remote.h
+++ b/daemon/remote.h
@@ -25,7 +25,7 @@
 #define __LIBVIRTD_REMOTE_H__
 
 
-#include "qemud.h"
+#include "libvirtd.h"
 
 typedef union {
 #include "remote_dispatch_args.h"