From 322585731ced1adba36cddcb8bdd5d997d1b2e3e Mon Sep 17 00:00:00 2001
From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 3 Nov 2011 11:34:59 -0400
Subject: [PATCH] Rename ltt-sessiond to lttng-sessiond

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---
 .gitignore                                           |  4 ++--
 Makefile.am                                          |  2 +-
 README                                               |  4 ++--
 configure.ac                                         |  2 +-
 doc/quickstart.txt                                   |  4 ++--
 doc/session-daemon-model.txt                         |  1 +
 include/lttng-sessiond-comm.h                        |  8 ++++----
 include/lttng/lttng-consumer.h                       |  4 ++--
 liblttng-consumer/lttng-consumer.c                   |  4 ++--
 lttng-consumerd/lttng-consumerd.c                    |  6 +++---
 {ltt-sessiond => lttng-sessiond}/Makefile.am         | 12 ++++++------
 {ltt-sessiond => lttng-sessiond}/channel.c           |  0
 {ltt-sessiond => lttng-sessiond}/channel.h           |  0
 .../compat/compat-epoll.c                            |  0
 .../compat/compat-poll.c                             |  0
 {ltt-sessiond => lttng-sessiond}/compat/poll.h       |  0
 {ltt-sessiond => lttng-sessiond}/context.c           |  0
 {ltt-sessiond => lttng-sessiond}/context.h           |  0
 {ltt-sessiond => lttng-sessiond}/event.c             |  0
 {ltt-sessiond => lttng-sessiond}/event.h             |  0
 {ltt-sessiond => lttng-sessiond}/futex.c             |  0
 {ltt-sessiond => lttng-sessiond}/futex.h             |  0
 {ltt-sessiond => lttng-sessiond}/hashtable.c         |  0
 {ltt-sessiond => lttng-sessiond}/hashtable.h         |  0
 {ltt-sessiond => lttng-sessiond}/kernel-ctl.c        |  0
 {ltt-sessiond => lttng-sessiond}/kernel-ctl.h        |  0
 .../lttng-sessiond.h                                 |  0
 {ltt-sessiond => lttng-sessiond}/lttng-ust-abi.h     |  0
 {ltt-sessiond => lttng-sessiond}/lttng-ust-ctl.h     |  0
 {ltt-sessiond => lttng-sessiond}/main.c              |  2 +-
 {ltt-sessiond => lttng-sessiond}/session.c           |  0
 {ltt-sessiond => lttng-sessiond}/session.h           |  0
 {ltt-sessiond => lttng-sessiond}/shm.c               |  0
 {ltt-sessiond => lttng-sessiond}/shm.h               |  0
 {ltt-sessiond => lttng-sessiond}/trace-kernel.c      |  0
 {ltt-sessiond => lttng-sessiond}/trace-kernel.h      |  0
 {ltt-sessiond => lttng-sessiond}/trace-ust.c         |  0
 {ltt-sessiond => lttng-sessiond}/trace-ust.h         |  0
 {ltt-sessiond => lttng-sessiond}/ust-app.c           |  0
 {ltt-sessiond => lttng-sessiond}/ust-app.h           |  0
 {ltt-sessiond => lttng-sessiond}/ust-consumer.c      |  0
 {ltt-sessiond => lttng-sessiond}/ust-consumer.h      |  0
 {ltt-sessiond => lttng-sessiond}/ust-ctl.c           |  0
 {ltt-sessiond => lttng-sessiond}/ust-ctl.h           |  0
 {ltt-sessiond => lttng-sessiond}/utils.c             |  0
 {ltt-sessiond => lttng-sessiond}/utils.h             |  0
 lttng/lttng.c                                        |  6 +++---
 tests/Makefile.am                                    |  4 ++--
 tests/lttng/run-kernel-tests.sh                      |  4 ++--
 tests/test_kernel_data_trace.c                       |  2 +-
 tests/test_sessions.c                                |  2 +-
 51 files changed, 36 insertions(+), 35 deletions(-)
 rename {ltt-sessiond => lttng-sessiond}/Makefile.am (80%)
 rename {ltt-sessiond => lttng-sessiond}/channel.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/channel.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/compat/compat-epoll.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/compat/compat-poll.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/compat/poll.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/context.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/context.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/event.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/event.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/futex.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/futex.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/hashtable.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/hashtable.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/kernel-ctl.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/kernel-ctl.h (100%)
 rename ltt-sessiond/ltt-sessiond.h => lttng-sessiond/lttng-sessiond.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/lttng-ust-abi.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/lttng-ust-ctl.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/main.c (99%)
 rename {ltt-sessiond => lttng-sessiond}/session.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/session.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/shm.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/shm.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/trace-kernel.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/trace-kernel.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/trace-ust.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/trace-ust.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/ust-app.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/ust-app.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/ust-consumer.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/ust-consumer.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/ust-ctl.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/ust-ctl.h (100%)
 rename {ltt-sessiond => lttng-sessiond}/utils.c (100%)
 rename {ltt-sessiond => lttng-sessiond}/utils.h (100%)

diff --git a/.gitignore b/.gitignore
index cf4970371..c2b6ff596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,9 +30,9 @@ config/
 !config/epoll.m4
 !config/config_feature.m4
 
-ltt-sessiond/ltt-sessiond
+lttng-sessiond/lttng-sessiond
 lttng/lttng
-ltt-kconsumerd/ltt-kconsumerd
+lttng-kconsumerd/lttng-kconsumerd
 lttng-consumerd/lttng-consumerd
 
 tests/test_sessions
diff --git a/Makefile.am b/Makefile.am
index e43da8d75..44f17148b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = liblttng-sessiond-comm \
 		  lttng-consumerd \
 		  liblttngctl \
 		  lttng \
-		  ltt-sessiond \
+		  lttng-sessiond \
 		  tests \
 		  include \
 		  doc
diff --git a/README b/README
index 04d840889..03bc1f591 100644
--- a/README
+++ b/README
@@ -50,7 +50,7 @@ PACKAGE CONTENTS:
       The LTTng tracing control library.
 
     - liblttng-sessiond-comm
-      The ltt-sessiond communication library. In order to talk with ltt-sessiond,
+      The lttng-sessiond communication library. In order to talk with lttng-sessiond,
       this library must be used.
 
     - libkernelctl
@@ -62,7 +62,7 @@ PACKAGE CONTENTS:
     - lttng-consumerd
       The consumer daemon which uses liblttng-consumer.
 
-    - ltt-sessiond
+    - lttng-sessiond
       The LTTng session daemon binary.
 
     - lttng
diff --git a/configure.ac b/configure.ac
index ff950cd79..3ead48e7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ AC_CONFIG_FILES([
 	liblttngctl/Makefile
 	liblttng-sessiond-comm/Makefile
 	lttng-consumerd/Makefile
-	ltt-sessiond/Makefile
+	lttng-sessiond/Makefile
 	lttng/Makefile
 	tests/Makefile
 	doc/Makefile
diff --git a/doc/quickstart.txt b/doc/quickstart.txt
index be43d49df..7078eecc9 100644
--- a/doc/quickstart.txt
+++ b/doc/quickstart.txt
@@ -18,7 +18,7 @@ installed. See http://lttng.org/lttng2.0 for more instructions for that part.
 For user-space tracing, you'll need an instrumented application, please see
 http://lttng.org/ust.
 
-lttng-tools provide a session daemon (ltt-sessiond) that acts as a tracing
+lttng-tools provide a session daemon (lttng-sessiond) that acts as a tracing
 registry. To trace any instrumented applications or the kernel, a registered
 tracing session is needed beforehand. To interact with the session daemon and a
 tracing session, you should use the lttng command line UI (lttng).
@@ -36,7 +36,7 @@ The next sections explain how to do tracing :)
 Kernel Tracing
 --------------
 
-You can start the session daemon by invoking the command "ltt-sessiond",
+You can start the session daemon by invoking the command "lttng-sessiond",
 or let the lttng command line tool do it for you. The session daemon
 loads the LTTng tracer modules for you if those modules can be found on
 your system. If they are not found, the kernel tracing feature will be
diff --git a/doc/session-daemon-model.txt b/doc/session-daemon-model.txt
index 6b9f4dc17..da42e276d 100644
--- a/doc/session-daemon-model.txt
+++ b/doc/session-daemon-model.txt
@@ -47,6 +47,7 @@ Terminology
 -----------------
 
 ltt-sessiond - Main daemon for trace session registry for UST and LTTng
+NOTE: Changed to lttng-sessiond in the git tree
 
 ust-consumerd - Daemon that consume UST buffers for a specific application
 
diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
index f30bf6673..ae978c278 100644
--- a/include/lttng-sessiond-comm.h
+++ b/include/lttng-sessiond-comm.h
@@ -32,10 +32,10 @@
 #define LTTNG_RUNDIR                        "/var/run/lttng"
 
 /* Default unix socket path */
-#define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK     LTTNG_RUNDIR "/client-ltt-sessiond"
-#define DEFAULT_GLOBAL_APPS_UNIX_SOCK       LTTNG_RUNDIR "/apps-ltt-sessiond"
-#define DEFAULT_HOME_APPS_UNIX_SOCK         "%s/.apps-ltt-sessiond"
-#define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-ltt-sessiond"
+#define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK     LTTNG_RUNDIR "/client-lttng-sessiond"
+#define DEFAULT_GLOBAL_APPS_UNIX_SOCK       LTTNG_RUNDIR "/apps-lttng-sessiond"
+#define DEFAULT_HOME_APPS_UNIX_SOCK         "%s/.apps-lttng-sessiond"
+#define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-lttng-sessiond"
 
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
diff --git a/include/lttng/lttng-consumer.h b/include/lttng/lttng-consumer.h
index 2587b3b18..a0277cf04 100644
--- a/include/lttng/lttng-consumer.h
+++ b/include/lttng/lttng-consumer.h
@@ -28,8 +28,8 @@
 /*
  * When the receiving thread dies, we need to have a way to make the polling
  * thread exit eventually. If all FDs hang up (normal case when the
- * ltt-sessiond stops), we can exit cleanly, but if there is a problem and for
- * whatever reason some FDs remain open, the consumer should still exit
+ * lttng-sessiond stops), we can exit cleanly, but if there is a problem and
+ * for whatever reason some FDs remain open, the consumer should still exit
  * eventually.
  *
  * If the timeout is reached, it means that during this period no events
diff --git a/liblttng-consumer/lttng-consumer.c b/liblttng-consumer/lttng-consumer.c
index f031d5a67..081d6142b 100644
--- a/liblttng-consumer/lttng-consumer.c
+++ b/liblttng-consumer/lttng-consumer.c
@@ -916,11 +916,11 @@ void *lttng_consumer_thread_receive_fds(void *data)
 		goto end;
 	}
 
-	DBG("Sending ready command to ltt-sessiond");
+	DBG("Sending ready command to lttng-sessiond");
 	ret = lttng_consumer_send_error(ctx, CONSUMERD_COMMAND_SOCK_READY);
 	/* return < 0 on error, but == 0 is not fatal */
 	if (ret < 0) {
-		ERR("Error sending ready command to ltt-sessiond");
+		ERR("Error sending ready command to lttng-sessiond");
 		goto end;
 	}
 
diff --git a/lttng-consumerd/lttng-consumerd.c b/lttng-consumerd/lttng-consumerd.c
index cac71cace..946f0aba0 100644
--- a/lttng-consumerd/lttng-consumerd.c
+++ b/lttng-consumerd/lttng-consumerd.c
@@ -401,12 +401,12 @@ int main(int argc, char **argv)
 		goto error;
 	}
 
-	/* Connect to the socket created by ltt-sessiond to report errors */
+	/* Connect to the socket created by lttng-sessiond to report errors */
 	DBG("Connecting to error socket %s", error_sock_path);
 	ret = lttcomm_connect_unix_sock(error_sock_path);
-	/* not a fatal error, but all communication with ltt-sessiond will fail */
+	/* not a fatal error, but all communication with lttng-sessiond will fail */
 	if (ret < 0) {
-		WARN("Cannot connect to error socket, is ltt-sessiond started ?");
+		WARN("Cannot connect to error socket, is lttng-sessiond started ?");
 	}
 	lttng_consumer_set_error_sock(ctx, ret);
 
diff --git a/ltt-sessiond/Makefile.am b/lttng-sessiond/Makefile.am
similarity index 80%
rename from ltt-sessiond/Makefile.am
rename to lttng-sessiond/Makefile.am
index 4c23849cf..78179bd7a 100644
--- a/ltt-sessiond/Makefile.am
+++ b/lttng-sessiond/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \
 
 AM_CFLAGS = -fno-strict-aliasing
 
-bin_PROGRAMS = ltt-sessiond
+bin_PROGRAMS = lttng-sessiond
 
 if COMPAT_EPOLL
 COMPAT=compat/compat-epoll.c
@@ -11,7 +11,7 @@ else
 COMPAT=compat/compat-poll.c
 endif
 
-ltt_sessiond_SOURCES = utils.c utils.h \
+lttng_sessiond_SOURCES = utils.c utils.h \
                        hashtable.c hashtable.h \
                        compat/poll.h $(COMPAT) \
                        trace-kernel.c trace-kernel.h \
@@ -28,18 +28,18 @@ ltt_sessiond_SOURCES = utils.c utils.h \
                        ../hashtable/hash.c ../hashtable/hash.h
 
 if LTTNG_TOOLS_HAVE_UST
-ltt_sessiond_SOURCES += trace-ust.c ust-app.c ust-consumer.c ust-consumer.h
+lttng_sessiond_SOURCES += trace-ust.c ust-app.c ust-consumer.c ust-consumer.h
 endif
 
 # Add main.c at the end for compile order
-ltt_sessiond_SOURCES += ltt-sessiond.h main.c
+lttng_sessiond_SOURCES += lttng-sessiond.h main.c
 
 # link on liblttngctl for check if sessiond is already alive.
-ltt_sessiond_LDADD = -lrt -lurcu-cds -lurcu \
+lttng_sessiond_LDADD = -lrt -lurcu-cds -lurcu \
 		 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
 		 $(top_builddir)/libkernelctl/libkernelctl.la \
 		 $(top_builddir)/liblttngctl/liblttngctl.la
 
 if LTTNG_TOOLS_HAVE_UST
-ltt_sessiond_LDADD += -llttng-ust-comm -lustctl
+lttng_sessiond_LDADD += -llttng-ust-comm -lustctl
 endif
diff --git a/ltt-sessiond/channel.c b/lttng-sessiond/channel.c
similarity index 100%
rename from ltt-sessiond/channel.c
rename to lttng-sessiond/channel.c
diff --git a/ltt-sessiond/channel.h b/lttng-sessiond/channel.h
similarity index 100%
rename from ltt-sessiond/channel.h
rename to lttng-sessiond/channel.h
diff --git a/ltt-sessiond/compat/compat-epoll.c b/lttng-sessiond/compat/compat-epoll.c
similarity index 100%
rename from ltt-sessiond/compat/compat-epoll.c
rename to lttng-sessiond/compat/compat-epoll.c
diff --git a/ltt-sessiond/compat/compat-poll.c b/lttng-sessiond/compat/compat-poll.c
similarity index 100%
rename from ltt-sessiond/compat/compat-poll.c
rename to lttng-sessiond/compat/compat-poll.c
diff --git a/ltt-sessiond/compat/poll.h b/lttng-sessiond/compat/poll.h
similarity index 100%
rename from ltt-sessiond/compat/poll.h
rename to lttng-sessiond/compat/poll.h
diff --git a/ltt-sessiond/context.c b/lttng-sessiond/context.c
similarity index 100%
rename from ltt-sessiond/context.c
rename to lttng-sessiond/context.c
diff --git a/ltt-sessiond/context.h b/lttng-sessiond/context.h
similarity index 100%
rename from ltt-sessiond/context.h
rename to lttng-sessiond/context.h
diff --git a/ltt-sessiond/event.c b/lttng-sessiond/event.c
similarity index 100%
rename from ltt-sessiond/event.c
rename to lttng-sessiond/event.c
diff --git a/ltt-sessiond/event.h b/lttng-sessiond/event.h
similarity index 100%
rename from ltt-sessiond/event.h
rename to lttng-sessiond/event.h
diff --git a/ltt-sessiond/futex.c b/lttng-sessiond/futex.c
similarity index 100%
rename from ltt-sessiond/futex.c
rename to lttng-sessiond/futex.c
diff --git a/ltt-sessiond/futex.h b/lttng-sessiond/futex.h
similarity index 100%
rename from ltt-sessiond/futex.h
rename to lttng-sessiond/futex.h
diff --git a/ltt-sessiond/hashtable.c b/lttng-sessiond/hashtable.c
similarity index 100%
rename from ltt-sessiond/hashtable.c
rename to lttng-sessiond/hashtable.c
diff --git a/ltt-sessiond/hashtable.h b/lttng-sessiond/hashtable.h
similarity index 100%
rename from ltt-sessiond/hashtable.h
rename to lttng-sessiond/hashtable.h
diff --git a/ltt-sessiond/kernel-ctl.c b/lttng-sessiond/kernel-ctl.c
similarity index 100%
rename from ltt-sessiond/kernel-ctl.c
rename to lttng-sessiond/kernel-ctl.c
diff --git a/ltt-sessiond/kernel-ctl.h b/lttng-sessiond/kernel-ctl.h
similarity index 100%
rename from ltt-sessiond/kernel-ctl.h
rename to lttng-sessiond/kernel-ctl.h
diff --git a/ltt-sessiond/ltt-sessiond.h b/lttng-sessiond/lttng-sessiond.h
similarity index 100%
rename from ltt-sessiond/ltt-sessiond.h
rename to lttng-sessiond/lttng-sessiond.h
diff --git a/ltt-sessiond/lttng-ust-abi.h b/lttng-sessiond/lttng-ust-abi.h
similarity index 100%
rename from ltt-sessiond/lttng-ust-abi.h
rename to lttng-sessiond/lttng-ust-abi.h
diff --git a/ltt-sessiond/lttng-ust-ctl.h b/lttng-sessiond/lttng-ust-ctl.h
similarity index 100%
rename from ltt-sessiond/lttng-ust-ctl.h
rename to lttng-sessiond/lttng-ust-ctl.h
diff --git a/ltt-sessiond/main.c b/lttng-sessiond/main.c
similarity index 99%
rename from ltt-sessiond/main.c
rename to lttng-sessiond/main.c
index 2c2fe44bf..ea3853c1a 100644
--- a/ltt-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -51,7 +51,7 @@
 #include "futex.h"
 #include "hashtable.h"
 #include "kernel-ctl.h"
-#include "ltt-sessiond.h"
+#include "lttng-sessiond.h"
 #include "shm.h"
 #include "ust-app.h"
 #include "ust-ctl.h"
diff --git a/ltt-sessiond/session.c b/lttng-sessiond/session.c
similarity index 100%
rename from ltt-sessiond/session.c
rename to lttng-sessiond/session.c
diff --git a/ltt-sessiond/session.h b/lttng-sessiond/session.h
similarity index 100%
rename from ltt-sessiond/session.h
rename to lttng-sessiond/session.h
diff --git a/ltt-sessiond/shm.c b/lttng-sessiond/shm.c
similarity index 100%
rename from ltt-sessiond/shm.c
rename to lttng-sessiond/shm.c
diff --git a/ltt-sessiond/shm.h b/lttng-sessiond/shm.h
similarity index 100%
rename from ltt-sessiond/shm.h
rename to lttng-sessiond/shm.h
diff --git a/ltt-sessiond/trace-kernel.c b/lttng-sessiond/trace-kernel.c
similarity index 100%
rename from ltt-sessiond/trace-kernel.c
rename to lttng-sessiond/trace-kernel.c
diff --git a/ltt-sessiond/trace-kernel.h b/lttng-sessiond/trace-kernel.h
similarity index 100%
rename from ltt-sessiond/trace-kernel.h
rename to lttng-sessiond/trace-kernel.h
diff --git a/ltt-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
similarity index 100%
rename from ltt-sessiond/trace-ust.c
rename to lttng-sessiond/trace-ust.c
diff --git a/ltt-sessiond/trace-ust.h b/lttng-sessiond/trace-ust.h
similarity index 100%
rename from ltt-sessiond/trace-ust.h
rename to lttng-sessiond/trace-ust.h
diff --git a/ltt-sessiond/ust-app.c b/lttng-sessiond/ust-app.c
similarity index 100%
rename from ltt-sessiond/ust-app.c
rename to lttng-sessiond/ust-app.c
diff --git a/ltt-sessiond/ust-app.h b/lttng-sessiond/ust-app.h
similarity index 100%
rename from ltt-sessiond/ust-app.h
rename to lttng-sessiond/ust-app.h
diff --git a/ltt-sessiond/ust-consumer.c b/lttng-sessiond/ust-consumer.c
similarity index 100%
rename from ltt-sessiond/ust-consumer.c
rename to lttng-sessiond/ust-consumer.c
diff --git a/ltt-sessiond/ust-consumer.h b/lttng-sessiond/ust-consumer.h
similarity index 100%
rename from ltt-sessiond/ust-consumer.h
rename to lttng-sessiond/ust-consumer.h
diff --git a/ltt-sessiond/ust-ctl.c b/lttng-sessiond/ust-ctl.c
similarity index 100%
rename from ltt-sessiond/ust-ctl.c
rename to lttng-sessiond/ust-ctl.c
diff --git a/ltt-sessiond/ust-ctl.h b/lttng-sessiond/ust-ctl.h
similarity index 100%
rename from ltt-sessiond/ust-ctl.h
rename to lttng-sessiond/ust-ctl.h
diff --git a/ltt-sessiond/utils.c b/lttng-sessiond/utils.c
similarity index 100%
rename from ltt-sessiond/utils.c
rename to lttng-sessiond/utils.c
diff --git a/ltt-sessiond/utils.h b/lttng-sessiond/utils.h
similarity index 100%
rename from ltt-sessiond/utils.h
rename to lttng-sessiond/utils.h
diff --git a/lttng/lttng.c b/lttng/lttng.c
index e76136669..e488cc566 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -287,7 +287,7 @@ static int spawn_sessiond(char *pathname)
 		 * Spawn session daemon and tell
 		 * it to signal us when ready.
 		 */
-		execlp(pathname, "ltt-sessiond", "--sig-parent", "--quiet", NULL);
+		execlp(pathname, "lttng-sessiond", "--sig-parent", "--quiet", NULL);
 		/* execlp only returns if error happened */
 		if (errno == ENOENT) {
 			ERR("No session daemon found. Use --sessiond-path.");
@@ -297,7 +297,7 @@ static int spawn_sessiond(char *pathname)
 		kill(getppid(), SIGTERM);	/* unpause parent */
 		exit(EXIT_FAILURE);
 	} else if (pid > 0) {
-		/* Wait for ltt-sessiond to start */
+		/* Wait for lttng-sessiond to start */
 		pause();
 		goto end;
 	} else {
@@ -339,7 +339,7 @@ static int check_sessiond(void)
 
 		/* Let's rock and roll */
 		if (pathname == NULL) {
-			ret = asprintf(&alloc_pathname, INSTALL_BIN_PATH "/ltt-sessiond");
+			ret = asprintf(&alloc_pathname, INSTALL_BIN_PATH "/lttng-sessiond");
 			if (ret < 0) {
 				perror("asprintf spawn sessiond");
 				goto end;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e0b369730..f64ca5291 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,9 +7,9 @@ noinst_PROGRAMS = test_sessions test_kernel_data_trace kernel_all_events_basic \
 				  kernel_event_basic
 
 UTILS=utils.h
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c $(top_srcdir)/ltt-sessiond/hashtable.c \
+SESSIONS=$(top_srcdir)/lttng-sessiond/session.c $(top_srcdir)/lttng-sessiond/hashtable.c \
 		 $(top_srcdir)/hashtable/rculfhash.c $(top_srcdir)/hashtable/hash.c
-KERN_DATA_TRACE=$(top_srcdir)/ltt-sessiond/trace-kernel.c
+KERN_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-kernel.c
 LIBLTTNG=$(top_srcdir)/liblttngctl/lttngctl.c \
 		 $(top_srcdir)/liblttng-sessiond-comm/lttng-sessiond-comm.c
 
diff --git a/tests/lttng/run-kernel-tests.sh b/tests/lttng/run-kernel-tests.sh
index 28ad6281b..04814fc9c 100755
--- a/tests/lttng/run-kernel-tests.sh
+++ b/tests/lttng/run-kernel-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SESSIOND_BIN="ltt-sessiond"
+SESSIOND_BIN="lttng-sessiond"
 
 tmpdir=`mktemp -d`
 tests=( kernel_event_basic kernel_all_events_basic )
@@ -42,7 +42,7 @@ check_lttng_modules
 
 if [ -z $(pidof $SESSIOND_BIN) ]; then
 	echo -n "Starting session daemon... "
-	../ltt-sessiond/$SESSIOND_BIN --daemonize --quiet
+	../lttng-sessiond/$SESSIOND_BIN --daemonize --quiet
 	if [ $? -eq 1 ]; then
 		echo -e '\e[1;31mFAILED\e[0m'
 		rm -rf $tmpdir
diff --git a/tests/test_kernel_data_trace.c b/tests/test_kernel_data_trace.c
index 548714e94..05fac0949 100644
--- a/tests/test_kernel_data_trace.c
+++ b/tests/test_kernel_data_trace.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "ltt-sessiond/trace-kernel.h"
+#include "lttng-sessiond/trace-kernel.h"
 #include "utils.h"
 
 /* This path will NEVER be created in this test */
diff --git a/tests/test_sessions.c b/tests/test_sessions.c
index 461a33c1e..3e45c21b6 100644
--- a/tests/test_sessions.c
+++ b/tests/test_sessions.c
@@ -27,7 +27,7 @@
 
 #include <lttng-sessiond-comm.h>
 
-#include <ltt-sessiond/session.h>
+#include <lttng-sessiond/session.h>
 #include "utils.h"
 
 #define SESSION1 "test1"
-- 
2.34.1