diff --git a/Makefile.am b/Makefile.am
index 1926e21b7a..709064c6a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,7 @@ check-access:
 cov: clean-cov
 	$(MKDIR_P) $(top_builddir)/coverage
 	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
-	  -d $(top_builddir)/src  -d $(top_builddir)/daemon \
+	  -d $(top_builddir)/src \
 	  -d $(top_builddir)/tests
 	$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
 	  -o $(top_builddir)/coverage/libvirt.info
diff --git a/docs/compiling.html.in b/docs/compiling.html.in
index 5bed7ae146..8dcceb3eb9 100644
--- a/docs/compiling.html.in
+++ b/docs/compiling.html.in
@@ -125,7 +125,7 @@ $ make
     <pre>
 $ su -
 # service libvirtd stop  (or systemctl stop libvirtd.service)
-# /home/to/your/checkout/daemon/libvirtd
+# /home/to/your/checkout/src/libvirtd
     </pre>
 
     <p>
diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp
index 78e94ba852..e01b2f79a6 100644
--- a/examples/systemtap/lock-debug.stp
+++ b/examples/systemtap/lock-debug.stp
@@ -11,7 +11,7 @@
 # Document usage with uninstalled daemon and libs. Assuming CWD is toplevel
 # source git directory, it should be only slight modification to the following:
 #
-#     ./run stap --ldd -c daemon/libvirtd -d daemon/libvirtd
+#     ./run stap --ldd -c src/libvirtd -d src/libvirtd
 #       examples/systemtap/lock-debug.stp src/.libs/libvirt.so
 #
 # Debug RWLock mechanisms as well.
diff --git a/src/libvirt_probes.d b/src/libvirt_probes.d
index c5bda5c974..2a8d600c0e 100644
--- a/src/libvirt_probes.d
+++ b/src/libvirt_probes.d
@@ -52,7 +52,7 @@ provider libvirt {
 	probe rpc_client_msg_rx(void *client, int len, int prog, int vers, int proc, int type, int status, int serial);
 
 
-	# file: daemon/libvirtd.c
+	# file: src/remote/remote_daemon.c
 	# prefix: rpc
 	probe rpc_server_client_auth_allow(void *client, int authtype, const char *identity);
 	probe rpc_server_client_auth_deny(void *client, int authtype, const char *identity);
diff --git a/tests/libvirtd-fail b/tests/libvirtd-fail
index 6c61b892cb..f9e927b61f 100755
--- a/tests/libvirtd-fail
+++ b/tests/libvirtd-fail
@@ -5,12 +5,12 @@
 
 if test "$VERBOSE" = yes; then
   set -x
-  $abs_top_builddir/daemon/libvirtd --version
+  $abs_top_builddir/src/libvirtd --version
 fi
 
 fail=0
 
-$abs_top_builddir/daemon/libvirtd --config=no-such-conf --timeout=5 2> log
+$abs_top_builddir/src/libvirtd --config=no-such-conf --timeout=5 2> log
 RET=$?
 
 test "$RET" != "0" && exit 0 || exit 1