diff --git a/daemon.am b/daemon.am
index 1059e444ab..abb785592d 100644
--- a/daemon.am
+++ b/daemon.am
@@ -112,8 +112,8 @@ libstore_a_CPPFLAGS =				\
   -I$(top_builddir)/nix/libstore		\
   -DNIX_STORE_DIR=\"$(storedir)\"		\
   -DNIX_DATA_DIR=\"$(datadir)\"			\
-  -DNIX_STATE_DIR=\"$(localstatedir)/nix\"	\
-  -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\"	\
+  -DNIX_STATE_DIR=\"$(localstatedir)/guix\"	\
+  -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\"	\
   -DNIX_CONF_DIR=\"$(sysconfdir)/guix\"		\
   -DNIX_LIBEXEC_DIR=\"$(libexecdir)\"		\
   -DNIX_BIN_DIR=\"$(bindir)\"			\
diff --git a/guix/config.scm.in b/guix/config.scm.in
index 5edb4ced30..eaadae9618 100644
--- a/guix/config.scm.in
+++ b/guix/config.scm.in
@@ -57,7 +57,7 @@
 
 (define %state-directory
   ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.
-  (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/nix"))
+  (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix"))
 
 (define %config-directory
   ;; This must match `NIX_CONF_DIR' as defined in `daemon.am'.
diff --git a/guix/store.scm b/guix/store.scm
index e92e159ff4..75edb340ae 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -827,7 +827,7 @@ must be an absolute store file name, or a derivation file name."
   (cond ((derivation-path? file)
          (let* ((base    (basename file))
                 (log     (string-append (dirname %state-directory) ; XXX
-                                        "/log/nix/drvs/"
+                                        "/log/guix/drvs/"
                                         (string-take base 2) "/"
                                         (string-drop base 2)))
                 (log.bz2 (string-append log ".bz2")))