diff --git a/README b/README
index 43c7a03..89e6798 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ Prerequisites:
 
 - the UAPI headers from the target kernel fit with the EVL core. We
   need access to the contents of include/uapi/asm/ and
-  include/uapi/evenless/ from the source Linux tree.
+  include/uapi/evl/ from the source Linux tree.
 
 Command:
 
@@ -42,22 +42,22 @@ Other build variables
 D={0|1}			Disable|enable debug build, i.e. -g -O0 vs -O2	[0]
 O=$output_dir		Generate binary output files into $output_dir	[.]
 V={0|1}			Set build verbosity level, 0 is terse		[0]
-DESTDIR=$install_dir	Install library and binaries into $install_dir	[/usr/evenless]
+DESTDIR=$install_dir	Install library and binaries into $install_dir	[/usr/evl]
 
 Build command examples
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Say the library source code is located at ~/git/evenless, and the
+Say the library source code is located at ~/git/evl, and the
 kernel sources featuring the EVL core is located at
-~/git/linux-evenless. You could build+install the EVL library and
+~/git/linux-evl. You could build+install the EVL library and
 utilities directly to a staging directory at
-/nfsroot/<machine>/usr/evenless as follows:
+/nfsroot/<machine>/usr/evl as follows:
 
 $ mkdir /tmp/build-imx6q && cd /tmp/build-imx6q
-$ make -C ~/git/evenless O=$PWD ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- UAPI=~/git/linux-evenless DESTDIR=/nfsroot/imx6q/usr/evenless install
+$ make -C ~/git/evl O=$PWD ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- UAPI=~/git/linux-evl DESTDIR=/nfsroot/imx6q/usr/evl install
 
 or,
 
 $ mkdir /tmp/build-hikey
-$ cd ~/git/evenless
-$ make O=/tmp/build-hikey ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- UAPI=~/git/linux-evenless DESTDIR=/nfsroot/hikey/usr/evenless install
+$ cd ~/git/evl
+$ make O=/tmp/build-hikey ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- UAPI=~/git/linux-evl DESTDIR=/nfsroot/hikey/usr/evl install
diff --git a/commands/evl-trace b/commands/evl-trace
index c201345..a182083 100755
--- a/commands/evl-trace
+++ b/commands/evl-trace
@@ -61,16 +61,16 @@ if test x$enable = xtrue; then
    if test x$full = xfalse; then
        echo 1 > events/irq/enable
        echo 1 > events/power/cpu_idle/enable
-       echo 1 > events/evenless/enable
+       echo 1 > events/evl/enable
    else
        echo function > current_tracer
    fi
    echo 1 > ${pcpu}snapshot
-   echo 1 > events/evenless/evl_timer_shot/enable
-   echo \!snapshot > events/evenless/evl_trigger/trigger
-   echo snapshot > events/evenless/evl_trigger/trigger
-   echo 1 > events/evenless/evl_trigger/enable
-   echo 1 > events/evenless/evl_latspot/enable
+   echo 1 > events/evl/evl_timer_shot/enable
+   echo \!snapshot > events/evl/evl_trigger/trigger
+   echo snapshot > events/evl/evl_trigger/trigger
+   echo 1 > events/evl/evl_trigger/enable
+   echo 1 > events/evl/evl_latspot/enable
    echo "tracing enabled"
    print=false
 elif test x$disable = xtrue; then
diff --git a/config.mk b/config.mk
index ccc9619..4b5d22b 100644
--- a/config.mk
+++ b/config.mk
@@ -8,7 +8,7 @@ CC		= $(CROSS_COMPILE)gcc
 LD		= $(CROSS_COMPILE)ld
 AR		= $(CROSS_COMPILE)ar
 UAPI		?= /usr/include
-DESTDIR		?= /usr/evenless
+DESTDIR		?= /usr/evl
 
 INSTALL		?= install
 INSTALL_PROGRAM	?= $(INSTALL)
diff --git a/include/Makefile b/include/Makefile
index 3876ff5..4312c01 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -10,22 +10,22 @@ uapi: $(O_DIR)/.uapi_stamp $(O_DIR)/uapi
 
 $(O_DIR)/.uapi_stamp $(O_DIR)/uapi:
 	$(Q)$(MKDIR_P) $(O_UAPI)
-	$(Q)$(RM) -f $(O_UAPI)/asm $(O_UAPI)/evenless
+	$(Q)$(RM) -f $(O_UAPI)/asm $(O_UAPI)/evl
 	$(Q)if test -r $(UAPI)/Makefile; then					\
 		$(LN_S) $(UAPI)/arch/$(ARCH)/include/uapi/asm $(O_UAPI)/asm;	\
-		$(LN_S) $(UAPI)/include/uapi/evenless $(O_UAPI)/evenless;	\
+		$(LN_S) $(UAPI)/include/uapi/evl $(O_UAPI)/evl;			\
 	else									\
 		$(LN_S) $(UAPI)/asm $(O_UAPI)/asm;				\
-		$(LN_S) $(UAPI)/evenless $(O_UAPI)/evenless;			\
+		$(LN_S) $(UAPI)/evl $(O_UAPI)/evl;				\
 	fi;									\
 	touch $@
 
 all: uapi
 
 clean clobber mrproper:
-	$(Q)$(RM) -f $(O_DIR)/.uapi_stamp $(O_UAPI)/asm $(O_UAPI)/evenless
+	$(Q)$(RM) -f $(O_DIR)/.uapi_stamp $(O_UAPI)/asm $(O_UAPI)/evl
 
 install: all
 	$(Q)$(MKDIR_P) $(DESTDIR)/$(includedir)/uapi
-	$(call inst-cmd,uapi-headers,cd $(O_UAPI) && find -L evenless \! \( -name '*~' \) -type f | $(CPIO) -Lpdum --quiet $(DESTDIR)/$(includedir)/uapi)
-	$(call inst-cmd,interface-headers,find evenless \! \( -name '*~' \) -type f | $(CPIO) -Lpdum --quiet $(DESTDIR)/$(includedir))
+	$(call inst-cmd,uapi-headers,cd $(O_UAPI) && find -L evl \! \( -name '*~' \) -type f | $(CPIO) -Lpdum --quiet $(DESTDIR)/$(includedir)/uapi)
+	$(call inst-cmd,interface-headers,find evl \! \( -name '*~' \) -type f | $(CPIO) -Lpdum --quiet $(DESTDIR)/$(includedir))
diff --git a/include/evenless/atomic.h b/include/evl/atomic.h
similarity index 87%
rename from include/evenless/atomic.h
rename to include/evl/atomic.h
index 7b47e9d..0aeec62 100644
--- a/include/evenless/atomic.h
+++ b/include/evl/atomic.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_ATOMIC_H
-#define _EVENLESS_ATOMIC_H
+#ifndef _EVL_ATOMIC_H
+#define _EVL_ATOMIC_H
 
 #include <linux/types.h>
 
@@ -34,4 +34,4 @@ static inline void atomic_set(atomic_t *ptr, long val)
 
 #define compiler_barrier()  __asm__ __volatile__("": : :"memory")
 
-#endif /* _EVENLESS_ATOMIC_H */
+#endif /* _EVL_ATOMIC_H */
diff --git a/include/evenless/clock.h b/include/evl/clock.h
similarity index 85%
rename from include/evenless/clock.h
rename to include/evl/clock.h
index a4d9be0..3b96f72 100644
--- a/include/evenless/clock.h
+++ b/include/evl/clock.h
@@ -4,15 +4,15 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_CLOCK_H
-#define _EVENLESS_CLOCK_H
+#ifndef _EVL_CLOCK_H
+#define _EVL_CLOCK_H
 
 #include <time.h>
 #include <errno.h>
 #include <sys/timex.h>
 #include <sys/ioctl.h>
-#include <evenless/syscall.h>
-#include <uapi/evenless/clock.h>
+#include <evl/syscall.h>
+#include <uapi/evl/clock.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +47,4 @@ int evl_udelay(unsigned int usecs);
 }
 #endif
 
-#endif /* _EVENLESS_CLOCK_H */
+#endif /* _EVL_CLOCK_H */
diff --git a/include/evenless/condvar.h b/include/evl/condvar.h
similarity index 86%
rename from include/evenless/condvar.h
rename to include/evl/condvar.h
index c6a483f..36abaf7 100644
--- a/include/evenless/condvar.h
+++ b/include/evl/condvar.h
@@ -4,14 +4,14 @@
  * Copyright (C) 2019 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_CONDVAR_H
-#define _EVENLESS_CONDVAR_H
+#ifndef _EVL_CONDVAR_H
+#define _EVL_CONDVAR_H
 
 #include <time.h>
 #include <linux/types.h>
-#include <evenless/atomic.h>
-#include <uapi/evenless/types.h>
-#include <uapi/evenless/monitor.h>
+#include <evl/atomic.h>
+#include <uapi/evl/types.h>
+#include <uapi/evl/monitor.h>
 
 struct evl_condvar {
 	unsigned int magic;
@@ -69,4 +69,4 @@ int evl_close_condvar(struct evl_condvar *cv);
 }
 #endif
 
-#endif /* _EVENLESS_CONDVAR_H */
+#endif /* _EVL_CONDVAR_H */
diff --git a/include/evenless/evl.h b/include/evl/evl.h
similarity index 53%
rename from include/evenless/evl.h
rename to include/evl/evl.h
index 29fb6c4..b99deac 100644
--- a/include/evenless/evl.h
+++ b/include/evl/evl.h
@@ -4,20 +4,20 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_EVL_H
-#define _EVENLESS_EVL_H
+#ifndef _EVL_EVL_H
+#define _EVL_EVL_H
 
 #include <signal.h>
-#include <evenless/clock.h>
-#include <evenless/mutex.h>
-#include <evenless/condvar.h>
-#include <evenless/sem.h>
-#include <evenless/syscall.h>
-#include <evenless/thread.h>
-#include <evenless/xbuf.h>
-#include <evenless/poll.h>
-#include <evenless/proxy.h>
-#include <evenless/utils.h>
+#include <evl/clock.h>
+#include <evl/mutex.h>
+#include <evl/condvar.h>
+#include <evl/sem.h>
+#include <evl/syscall.h>
+#include <evl/thread.h>
+#include <evl/xbuf.h>
+#include <evl/poll.h>
+#include <evl/proxy.h>
+#include <evl/utils.h>
 
 #define __EVL__  0	/* API revision */
 
@@ -37,4 +37,4 @@ unsigned int evl_detect_fpu(void);
 }
 #endif
 
-#endif /* _EVENLESS_EVL_H */
+#endif /* _EVL_EVL_H */
diff --git a/include/evenless/mutex.h b/include/evl/mutex.h
similarity index 90%
rename from include/evenless/mutex.h
rename to include/evl/mutex.h
index 5546ef7..8e3434b 100644
--- a/include/evenless/mutex.h
+++ b/include/evl/mutex.h
@@ -4,14 +4,14 @@
  * Copyright (C) 2019 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_MUTEX_H
-#define _EVENLESS_MUTEX_H
+#ifndef _EVL_MUTEX_H
+#define _EVL_MUTEX_H
 
 #include <time.h>
 #include <linux/types.h>
-#include <evenless/atomic.h>
-#include <uapi/evenless/types.h>
-#include <uapi/evenless/monitor.h>
+#include <evl/atomic.h>
+#include <uapi/evl/types.h>
+#include <uapi/evl/monitor.h>
 
 struct evl_mutex {
 	unsigned int magic;
@@ -87,4 +87,4 @@ int evl_close_mutex(struct evl_mutex *mutex);
 }
 #endif
 
-#endif /* _EVENLESS_MUTEX_H */
+#endif /* _EVL_MUTEX_H */
diff --git a/include/evenless/poll.h b/include/evl/poll.h
similarity index 84%
rename from include/evenless/poll.h
rename to include/evl/poll.h
index 83860ba..83c7ffc 100644
--- a/include/evenless/poll.h
+++ b/include/evl/poll.h
@@ -4,13 +4,13 @@
  * Copyright (C) 2019 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_POLL_H
-#define _EVENLESS_POLL_H
+#ifndef _EVL_POLL_H
+#define _EVL_POLL_H
 
 #include <sys/types.h>
 #include <sys/poll.h>
 #include <linux/types.h>
-#include <uapi/evenless/poll.h>
+#include <uapi/evl/poll.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,4 +36,4 @@ int evl_poll(int efd, struct evl_poll_event *pollset,
 }
 #endif
 
-#endif /* _EVENLESS_POLL_H */
+#endif /* _EVL_POLL_H */
diff --git a/include/evenless/proxy.h b/include/evl/proxy.h
similarity index 71%
rename from include/evenless/proxy.h
rename to include/evl/proxy.h
index dbeb3ba..2b04921 100644
--- a/include/evenless/proxy.h
+++ b/include/evl/proxy.h
@@ -4,12 +4,12 @@
  * Copyright (C) 2019 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_PROXY_H
-#define _EVENLESS_PROXY_H
+#ifndef _EVL_PROXY_H
+#define _EVL_PROXY_H
 
 #include <sys/types.h>
 #include <linux/types.h>
-#include <uapi/evenless/proxy.h>
+#include <uapi/evl/proxy.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,4 +22,4 @@ int evl_new_proxy(int fd, size_t bufsz,
 }
 #endif
 
-#endif /* _EVENLESS_PROXY_H */
+#endif /* _EVL_PROXY_H */
diff --git a/include/evenless/sem.h b/include/evl/sem.h
similarity index 86%
rename from include/evenless/sem.h
rename to include/evl/sem.h
index fa3c0be..1209538 100644
--- a/include/evenless/sem.h
+++ b/include/evl/sem.h
@@ -4,14 +4,14 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_SEM_H
-#define _EVENLESS_SEM_H
+#ifndef _EVL_SEM_H
+#define _EVL_SEM_H
 
 #include <time.h>
-#include <evenless/atomic.h>
+#include <evl/atomic.h>
 #include <linux/types.h>
-#include <uapi/evenless/types.h>
-#include <uapi/evenless/monitor.h>
+#include <uapi/evl/types.h>
+#include <uapi/evl/monitor.h>
 
 struct evl_thread;
 
@@ -70,4 +70,4 @@ int evl_getval(struct evl_sem *sem);
 }
 #endif
 
-#endif /* _EVENLESS_SEM_H */
+#endif /* _EVL_SEM_H */
diff --git a/include/evenless/syscall.h b/include/evl/syscall.h
similarity index 80%
rename from include/evenless/syscall.h
rename to include/evl/syscall.h
index c986466..854c433 100644
--- a/include/evenless/syscall.h
+++ b/include/evl/syscall.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_SYSCALL_H
-#define _EVENLESS_SYSCALL_H
+#ifndef _EVL_SYSCALL_H
+#define _EVL_SYSCALL_H
 
 #include <sys/types.h>
 
@@ -23,4 +23,4 @@ int oob_ioctl(int efd, unsigned long request, ...);
 }
 #endif
 
-#endif /* _EVENLESS_SYSCALL_H */
+#endif /* _EVL_SYSCALL_H */
diff --git a/include/evenless/thread.h b/include/evl/thread.h
similarity index 85%
rename from include/evenless/thread.h
rename to include/evl/thread.h
index a387edf..3fb1016 100644
--- a/include/evenless/thread.h
+++ b/include/evl/thread.h
@@ -4,14 +4,14 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_THREAD_H
-#define _EVENLESS_THREAD_H
+#ifndef _EVL_THREAD_H
+#define _EVL_THREAD_H
 
 #include <linux/types.h>
 #include <limits.h>
-#include <evenless/syscall.h>
-#include <uapi/evenless/thread.h>
-#include <uapi/evenless/sched.h>
+#include <evl/syscall.h>
+#include <uapi/evl/thread.h>
+#include <uapi/evl/sched.h>
 
 /* Enable dlopen() on libevl.so. */
 #define EVL_TLS_MODEL	"global-dynamic"
@@ -62,4 +62,4 @@ int evl_get_state(int efd, struct evl_thread_state *statebuf);
 }
 #endif
 
-#endif /* _EVENLESS_THREAD_H */
+#endif /* _EVL_THREAD_H */
diff --git a/include/evenless/timer.h b/include/evl/timer.h
similarity index 77%
rename from include/evenless/timer.h
rename to include/evl/timer.h
index ff9e36f..fbe6297 100644
--- a/include/evenless/timer.h
+++ b/include/evl/timer.h
@@ -4,12 +4,12 @@
  * Copyright (C) 2019 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_TIMER_H
-#define _EVENLESS_TIMER_H
+#ifndef _EVL_TIMER_H
+#define _EVL_TIMER_H
 
 #include <time.h>
 #include <linux/types.h>
-#include <uapi/evenless/clock.h>
+#include <uapi/evl/clock.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,4 +28,4 @@ int evl_get_timer(int efd,
 }
 #endif
 
-#endif /* _EVENLESS_TIMER_H */
+#endif /* _EVL_TIMER_H */
diff --git a/include/evenless/utils.h b/include/evl/utils.h
similarity index 83%
rename from include/evenless/utils.h
rename to include/evl/utils.h
index b3661c2..20bc875 100644
--- a/include/evenless/utils.h
+++ b/include/evl/utils.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2019 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_UTILS_H
-#define _EVENLESS_UTILS_H
+#ifndef _EVL_UTILS_H
+#define _EVL_UTILS_H
 
 #include <sys/types.h>
 
@@ -26,4 +26,4 @@ int evl_sched_control(int policy,
 }
 #endif
 
-#endif /* _EVENLESS_UTILS_H */
+#endif /* _EVL_UTILS_H */
diff --git a/include/evenless/xbuf.h b/include/evl/xbuf.h
similarity index 67%
rename from include/evenless/xbuf.h
rename to include/evl/xbuf.h
index f11abc4..36cde3c 100644
--- a/include/evenless/xbuf.h
+++ b/include/evl/xbuf.h
@@ -4,13 +4,13 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _EVENLESS_XBUF_H
-#define _EVENLESS_XBUF_H
+#ifndef _EVL_XBUF_H
+#define _EVL_XBUF_H
 
 #include <sys/types.h>
-#include <evenless/syscall.h>
+#include <evl/syscall.h>
 #include <linux/types.h>
-#include <uapi/evenless/xbuf.h>
+#include <uapi/evl/xbuf.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -23,4 +23,4 @@ int evl_new_xbuf(size_t i_bufsz, size_t o_bufsz,
 }
 #endif
 
-#endif /* _EVENLESS_XBUF_H */
+#endif /* _EVL_XBUF_H */
diff --git a/lib/arch/arm/include/asm/evenless/syscall.h b/lib/arch/arm/include/asm/evl/syscall.h
similarity index 82%
rename from lib/arch/arm/include/asm/evenless/syscall.h
rename to lib/arch/arm/include/asm/evl/syscall.h
index 78b8503..666770f 100644
--- a/lib/arch/arm/include/asm/evenless/syscall.h
+++ b/lib/arch/arm/include/asm/evl/syscall.h
@@ -4,12 +4,12 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _LIB_EVENLESS_ARM_SYSCALL_H
-#define _LIB_EVENLESS_ARM_SYSCALL_H
+#ifndef _LIB_EVL_ARM_SYSCALL_H
+#define _LIB_EVL_ARM_SYSCALL_H
 
 #include <uapi/asm/dovetail.h>
 
-#define evenless_syscall3(__nr, __a0, __a1, __a2)		\
+#define evl_syscall3(__nr, __a0, __a1, __a2)		\
 	({							\
 		register unsigned long __asc __asm__("r7");	\
 		register unsigned long __res __asm__("r0");	\
@@ -31,4 +31,4 @@
 		__res;						\
 	})
 
-#endif /* !_LIB_EVENLESS_ARM_SYSCALL_H */
+#endif /* !_LIB_EVL_ARM_SYSCALL_H */
diff --git a/lib/arch/arm64/include/asm/evenless/syscall.h b/lib/arch/arm64/include/asm/evl/syscall.h
similarity index 70%
rename from lib/arch/arm64/include/asm/evenless/syscall.h
rename to lib/arch/arm64/include/asm/evl/syscall.h
index d033ddf..3bf9402 100644
--- a/lib/arch/arm64/include/asm/evenless/syscall.h
+++ b/lib/arch/arm64/include/asm/evl/syscall.h
@@ -4,19 +4,19 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _LIB_EVENLESS_ARM64_SYSCALL_H
-#define _LIB_EVENLESS_ARM64_SYSCALL_H
+#ifndef _LIB_EVL_ARM64_SYSCALL_H
+#define _LIB_EVL_ARM64_SYSCALL_H
 
-#include <uapi/asm/evenless/syscall.h>
+#include <uapi/asm/evl/syscall.h>
 
-#define evenless_syscall3(__nr, __a0, __a1, __a2)			\
+#define evl_syscall3(__nr, __a0, __a1, __a2)			\
 	({								\
 		register unsigned int  __sc  __asm__("w8");		\
 		register unsigned long __res __asm__("x0");		\
 		register unsigned long __x0  __asm__("x0");		\
 		register unsigned long __x1  __asm__("x1");		\
 		register unsigned long __x2  __asm__("x2");		\
-		__sc = (unsigned int)((__nr)|__EVENLESS_SYSCALL_BIT);	\
+		__sc = (unsigned int)((__nr)|__EVL_SYSCALL_BIT);	\
 		__x0 = (unsigned long)(__a0);				\
 		__x1 = (unsigned long)(__a1);				\
 		__x2 = (unsigned long)(__a2);				\
@@ -29,4 +29,4 @@
 		__res;							\
 	})
 
-#endif /* !_LIB_EVENLESS_ARM64_SYSCALL_H */
+#endif /* !_LIB_EVL_ARM64_SYSCALL_H */
diff --git a/lib/clock.c b/lib/clock.c
index 367f5ac..cb0ad1a 100644
--- a/lib/clock.c
+++ b/lib/clock.c
@@ -10,9 +10,9 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/timex.h>
-#include <evenless/clock.h>
-#include <evenless/thread.h>
-#include <uapi/evenless/clock.h>
+#include <evl/clock.h>
+#include <evl/thread.h>
+#include <uapi/evl/clock.h>
 #include "internal.h"
 
 int evl_mono_clockfd, evl_real_clockfd;
diff --git a/lib/condvar.c b/lib/condvar.c
index 63e2cdd..d3832ed 100644
--- a/lib/condvar.c
+++ b/lib/condvar.c
@@ -16,14 +16,14 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <sched.h>
-#include <evenless/evl.h>
-#include <evenless/mutex.h>
-#include <evenless/condvar.h>
-#include <evenless/thread.h>
-#include <evenless/syscall.h>
+#include <evl/evl.h>
+#include <evl/mutex.h>
+#include <evl/condvar.h>
+#include <evl/thread.h>
+#include <evl/syscall.h>
 #include <linux/types.h>
-#include <uapi/evenless/factory.h>
-#include <uapi/evenless/mutex.h>
+#include <uapi/evl/factory.h>
+#include <uapi/evl/mutex.h>
 #include "internal.h"
 
 #define __CONDVAR_ACTIVE_MAGIC	0xef55ef55
diff --git a/lib/init.c b/lib/init.c
index b739474..54bebc1 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -14,12 +14,12 @@
 #include <pthread.h>
 #include <string.h>
 #include <stdio.h>
-#include <evenless/evl.h>
-#include <evenless/syscall.h>
-#include <evenless/thread.h>
+#include <evl/evl.h>
+#include <evl/syscall.h>
+#include <evl/thread.h>
 #include <linux/types.h>
-#include <uapi/evenless/control.h>
-#include <uapi/evenless/signal.h>
+#include <uapi/evl/control.h>
+#include <uapi/evl/signal.h>
 #include "internal.h"
 
 #define STDLOG_SIZE	32768
@@ -61,7 +61,7 @@ static inline int generic_init(void)
 	 * sign that we have no EVL core in there. Return with
 	 * -ENOSYS to give a clear hint about this.
 	 */
-	ctlfd = open("/dev/evenless/control", O_RDWR);
+	ctlfd = open("/dev/evl/control", O_RDWR);
 	if (ctlfd < 0)
 		return errno == -ENOENT ? -ENOSYS : -errno;
 
@@ -164,7 +164,7 @@ static void sigshadow_handler(int sig, siginfo_t *si, void *ctxt)
 
 	if ((!(sa->sa_flags & SA_SIGINFO) && sa->sa_handler == NULL) ||
 	    ((sa->sa_flags & SA_SIGINFO) && sa->sa_sigaction == NULL))
-		return;		/* Not sent by the Evenless core */
+		return;		/* Not sent by the EVL core */
 
 	pthread_sigmask(SIG_SETMASK, &sa->sa_mask, &omask);
 
diff --git a/lib/internal.c b/lib/internal.c
index 0a7841d..63289c1 100644
--- a/lib/internal.c
+++ b/lib/internal.c
@@ -12,11 +12,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <linux/types.h>
-#include <uapi/evenless/factory.h>
+#include <uapi/evl/factory.h>
 #include "internal.h"
 
 /*
- * Creating a Evenless element is done by the following steps:
+ * Creating an EVL element is done by the following steps:
  *
  * 1. open the clone device of the proper element class.
  *
@@ -36,7 +36,7 @@ int create_evl_element(const char *type, const char *name,
 	char *fdevname, *edevname;
 	int ffd, efd, ret;
 
-	ret = asprintf(&fdevname, "/dev/evenless/%s/clone", type);
+	ret = asprintf(&fdevname, "/dev/evl/%s/clone", type);
 	if (ret < 0)
 		return -ENOMEM;
 
@@ -55,10 +55,10 @@ int create_evl_element(const char *type, const char *name,
 	}
 
 	if (name)
-		ret = asprintf(&edevname, "/dev/evenless/%s/%s",
+		ret = asprintf(&edevname, "/dev/evl/%s/%s",
 			       type, name);
 	else
-		ret = asprintf(&edevname, "/dev/evenless/%s/%d",
+		ret = asprintf(&edevname, "/dev/evl/%s/%d",
 			       type, clone.eids.minor);
 	if (ret < 0) {
 		ret = -ENOMEM;
@@ -108,7 +108,7 @@ int open_evl_element_vargs(const char *type,
 	if (ret < 0)
 		return -ENOMEM;
 
-	ret = asprintf(&path, "/dev/evenless/%s/%s", type, name);
+	ret = asprintf(&path, "/dev/evl/%s/%s", type, name);
 	free(name);
 	if (ret < 0)
 		return -ENOMEM;
@@ -160,7 +160,7 @@ int create_evl_file(const char *type)
 	char *devname;
 	int fd, ret;
 
-	ret = asprintf(&devname, "/dev/evenless/%s", type);
+	ret = asprintf(&devname, "/dev/evl/%s", type);
 	if (ret < 0)
 		return -ENOMEM;
 
diff --git a/lib/internal.h b/lib/internal.h
index 44cea3b..ca3d288 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -4,13 +4,13 @@
  * Copyright (C) 2018 Philippe Gerum  <rpm@xenomai.org>
  */
 
-#ifndef _LIB_EVENLESS_INTERNAL_H
-#define _LIB_EVENLESS_INTERNAL_H
+#ifndef _LIB_EVL_INTERNAL_H
+#define _LIB_EVL_INTERNAL_H
 
 #include <time.h>
 #include <stdarg.h>
-#include <evenless/thread.h>
-#include <uapi/evenless/types.h>
+#include <evl/thread.h>
+#include <uapi/evl/types.h>
 
 /*
  * Length of per-thread print formatting buffer used by evl_printf().
@@ -72,4 +72,4 @@ extern int evl_mono_clockfd;
 
 extern int evl_real_clockfd;
 
-#endif /* _LIB_EVENLESS_INTERNAL_H */
+#endif /* _LIB_EVL_INTERNAL_H */
diff --git a/lib/mutex.c b/lib/mutex.c
index d726bd6..a21ca97 100644
--- a/lib/mutex.c
+++ b/lib/mutex.c
@@ -16,14 +16,14 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <sched.h>
-#include <evenless/atomic.h>
-#include <evenless/evl.h>
-#include <evenless/mutex.h>
-#include <evenless/thread.h>
-#include <evenless/syscall.h>
+#include <evl/atomic.h>
+#include <evl/evl.h>
+#include <evl/mutex.h>
+#include <evl/thread.h>
+#include <evl/syscall.h>
 #include <linux/types.h>
-#include <uapi/evenless/factory.h>
-#include <uapi/evenless/mutex.h>
+#include <uapi/evl/factory.h>
+#include <uapi/evl/mutex.h>
 #include "internal.h"
 
 #define __MUTEX_ACTIVE_MAGIC	0xab12ab12
diff --git a/lib/parse_vdso.h b/lib/parse_vdso.h
index 8e11f26..d933a94 100644
--- a/lib/parse_vdso.h
+++ b/lib/parse_vdso.h
@@ -1,8 +1,8 @@
 /*
  * SPDX-License-Identifier: MIT
  */
-#ifndef _LIB_EVENLESS_PARSE_VDSO_H
-#define _LIB_EVENLESS_PARSE_VDSO_H
+#ifndef _LIB_EVL_PARSE_VDSO_H
+#define _LIB_EVL_PARSE_VDSO_H
 
 void evl_init_vdso(void);
 
@@ -10,4 +10,4 @@ void *evl_lookup_vdso(const char *version, const char *name);
 
 void *evl_request_vdso(const char *version, const char *name);
 
-#endif /* !_LIB_EVENLESS_PARSE_VDSO_H */
+#endif /* !_LIB_EVL_PARSE_VDSO_H */
diff --git a/lib/poll.c b/lib/poll.c
index d6de368..1f752a7 100644
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <evenless/syscall.h>
-#include <evenless/poll.h>
+#include <evl/syscall.h>
+#include <evl/poll.h>
 #include "internal.h"
 
 int evl_new_poll(void)
diff --git a/lib/proxy.c b/lib/proxy.c
index 363e61e..f11de59 100644
--- a/lib/proxy.c
+++ b/lib/proxy.c
@@ -9,8 +9,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <evenless/proxy.h>
-#include <evenless/syscall.h>
+#include <evl/proxy.h>
+#include <evl/syscall.h>
 #include "internal.h"
 
 int evl_new_proxy(int fd, size_t bufsz, const char *fmt, ...)
diff --git a/lib/sem.c b/lib/sem.c
index 79d712d..8222b90 100644
--- a/lib/sem.c
+++ b/lib/sem.c
@@ -14,13 +14,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <pthread.h>
-#include <evenless/atomic.h>
-#include <evenless/evl.h>
-#include <evenless/sem.h>
-#include <evenless/thread.h>
-#include <evenless/syscall.h>
+#include <evl/atomic.h>
+#include <evl/evl.h>
+#include <evl/sem.h>
+#include <evl/thread.h>
+#include <evl/syscall.h>
 #include <linux/types.h>
-#include <uapi/evenless/factory.h>
+#include <uapi/evl/factory.h>
 #include "internal.h"
 
 #define __SEM_ACTIVE_MAGIC	0xcb13cb13
diff --git a/lib/syscall.c b/lib/syscall.c
index d41df3a..d5f1961 100644
--- a/lib/syscall.c
+++ b/lib/syscall.c
@@ -7,9 +7,9 @@
 #include <stdarg.h>
 #include <pthread.h>
 #include <errno.h>
-#include <evenless/syscall.h>
-#include <asm/evenless/syscall.h>
-#include <uapi/evenless/syscall.h>
+#include <evl/syscall.h>
+#include <asm/evl/syscall.h>
+#include <uapi/evl/syscall.h>
 
 ssize_t oob_read(int efd, void *buf, size_t count)
 {
@@ -17,7 +17,7 @@ ssize_t oob_read(int efd, void *buf, size_t count)
 	ssize_t ret;
 
 	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old_type);
-	ret = evenless_syscall3(sys_evenless_read, efd, buf, count);
+	ret = evl_syscall3(sys_evl_read, efd, buf, count);
 	pthread_setcanceltype(old_type, NULL);
 	if (ret < 0) {
 		errno = -ret;
@@ -33,7 +33,7 @@ ssize_t oob_write(int efd, const void *buf, size_t count)
 	ssize_t ret;
 
 	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old_type);
-	ret = evenless_syscall3(sys_evenless_write, efd, buf, count);
+	ret = evl_syscall3(sys_evl_write, efd, buf, count);
 	pthread_setcanceltype(old_type, NULL);
 	if (ret < 0) {
 		errno = -ret;
@@ -52,7 +52,7 @@ int oob_ioctl(int efd, unsigned long request, ...)
 	va_start(ap, request);
 	arg = va_arg(ap, long);
 	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old_type);
-	ret = evenless_syscall3(sys_evenless_ioctl, efd, request, arg);
+	ret = evl_syscall3(sys_evl_ioctl, efd, request, arg);
 	pthread_setcanceltype(old_type, NULL);
 	va_end(ap);
 
diff --git a/lib/thread.c b/lib/thread.c
index 8a4ddfe..7f79691 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -15,11 +15,11 @@
 #include <memory.h>
 #include <pthread.h>
 #include <sched.h>
-#include <evenless/evl.h>
-#include <evenless/thread.h>
+#include <evl/evl.h>
+#include <evl/thread.h>
 #include <linux/types.h>
-#include <uapi/evenless/factory.h>
-#include <uapi/evenless/control.h>
+#include <uapi/evl/factory.h>
+#include <uapi/evl/control.h>
 #include "internal.h"
 
 __thread __attribute__ ((tls_model (EVL_TLS_MODEL)))
diff --git a/lib/timer.c b/lib/timer.c
index c4c04b2..f9d1f04 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -7,8 +7,8 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <evenless/syscall.h>
-#include <evenless/timer.h>
+#include <evl/syscall.h>
+#include <evl/timer.h>
 #include "internal.h"
 
 int evl_new_timer(int clockfd)
diff --git a/lib/utils.c b/lib/utils.c
index 254db2a..9fa0034 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -11,11 +11,11 @@
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <evenless/thread.h>
-#include <evenless/syscall.h>
-#include <evenless/utils.h>
-#include <uapi/evenless/sched.h>
-#include <uapi/evenless/control.h>
+#include <evl/thread.h>
+#include <evl/syscall.h>
+#include <evl/utils.h>
+#include <uapi/evl/sched.h>
+#include <uapi/evl/control.h>
 #include "internal.h"
 
 ssize_t evl_log(int fd, const void *buf, size_t len)
diff --git a/lib/version.c b/lib/version.c
index 135a187..bc1657f 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -12,4 +12,4 @@
 #define git_hash  " -- " GIT_STAMP
 #endif
 
-const char *libevenless_version_string = "evl." LIBSERIAL git_hash;
+const char *libevl_version_string = "evl." LIBSERIAL git_hash;
diff --git a/lib/xbuf.c b/lib/xbuf.c
index c1eab8a..ec0ef9d 100644
--- a/lib/xbuf.c
+++ b/lib/xbuf.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <evenless/xbuf.h>
+#include <evl/xbuf.h>
 #include "internal.h"
 
 int evl_new_xbuf(size_t i_bufsz, size_t o_bufsz,
diff --git a/tests/basic-xbuf.c b/tests/basic-xbuf.c
index 818cf93..30fce58 100644
--- a/tests/basic-xbuf.c
+++ b/tests/basic-xbuf.c
@@ -7,8 +7,8 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include <evenless/thread.h>
-#include <evenless/xbuf.h>
+#include <evl/thread.h>
+#include <evl/xbuf.h>
 #include "helpers.h"
 
 static void *peer(void *arg)
diff --git a/tests/clock-timer-periodic.c b/tests/clock-timer-periodic.c
index 195c775..4bc6233 100644
--- a/tests/clock-timer-periodic.c
+++ b/tests/clock-timer-periodic.c
@@ -8,9 +8,9 @@
 #include <error.h>
 #include <errno.h>
 #include <unistd.h>
-#include <evenless/thread.h>
-#include <evenless/timer.h>
-#include <evenless/clock.h>
+#include <evl/thread.h>
+#include <evl/timer.h>
+#include <evl/clock.h>
 #include "helpers.h"
 
 int main(int argc, char *argv[])
diff --git a/tests/clone-fork-exec.c b/tests/clone-fork-exec.c
index 5cdffbf..0d262ef 100644
--- a/tests/clone-fork-exec.c
+++ b/tests/clone-fork-exec.c
@@ -8,7 +8,7 @@
 #include <error.h>
 #include <errno.h>
 #include <unistd.h>
-#include <evenless/thread.h>
+#include <evl/thread.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/detach-self.c b/tests/detach-self.c
index badef86..ce23b3b 100644
--- a/tests/detach-self.c
+++ b/tests/detach-self.c
@@ -7,7 +7,7 @@
 #include <error.h>
 #include <errno.h>
 #include <unistd.h>
-#include <evenless/thread.h>
+#include <evl/thread.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/duplicate-element.c b/tests/duplicate-element.c
index a0e3a4b..5177211 100644
--- a/tests/duplicate-element.c
+++ b/tests/duplicate-element.c
@@ -7,9 +7,9 @@
 #include <error.h>
 #include <errno.h>
 #include <unistd.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
-#include <evenless/evl.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
+#include <evl/evl.h>
 #include "helpers.h"
 
 int main(int argc, char *argv[])
diff --git a/tests/helpers.c b/tests/helpers.c
index f0d51ce..d02a1eb 100644
--- a/tests/helpers.c
+++ b/tests/helpers.c
@@ -19,7 +19,7 @@ char *get_unique_name_and_path(const char *type,
 	char *path;
 	int ret;
 
-	ret = asprintf(&path, "/dev/evenless/%s/test%d.%d",
+	ret = asprintf(&path, "/dev/evl/%s/test%d.%d",
 		       type, getpid(), serial);
 	if (ret < 0)
 		error(1, ENOMEM, "malloc");
diff --git a/tests/helpers.h b/tests/helpers.h
index 878f163..5d67507 100644
--- a/tests/helpers.h
+++ b/tests/helpers.h
@@ -2,8 +2,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef _EVENLESS_TESTS_HELPERS_H
-#define _EVENLESS_TESTS_HELPERS_H
+#ifndef _EVL_TESTS_HELPERS_H
+#define _EVL_TESTS_HELPERS_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -114,4 +114,4 @@ void timespec_add_ns(struct timespec *__restrict r,
 		const struct timespec *__restrict t,
 		long ns);
 
-#endif /* !_EVENLESS_TESTS_HELPERS_H */
+#endif /* !_EVL_TESTS_HELPERS_H */
diff --git a/tests/logger-stdout.c b/tests/logger-stdout.c
index e7292d0..ce3faeb 100644
--- a/tests/logger-stdout.c
+++ b/tests/logger-stdout.c
@@ -6,8 +6,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
-#include <evenless/proxy.h>
-#include <evenless/thread.h>
+#include <evl/proxy.h>
+#include <evl/thread.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/mapfd.c b/tests/mapfd.c
index 474d7ec..2304634 100644
--- a/tests/mapfd.c
+++ b/tests/mapfd.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <evenless/proxy.h>
+#include <evl/proxy.h>
 
 static inline int do_memfd_create(const char *name, int flags)
 {
@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
 	void *p;
 
 	if (argc > 1) {
-		ret = chdir("/dev/evenless/proxy");
+		ret = chdir("/dev/evl/proxy");
 		(void)ret;
 		efd = open(argv[1], O_RDWR);
 		if (efd < 0)
diff --git a/tests/monitor-pi.c b/tests/monitor-pi.c
index 4f50c16..9c1ab66 100644
--- a/tests/monitor-pi.c
+++ b/tests/monitor-pi.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/monitor-pp-dynamic.c b/tests/monitor-pp-dynamic.c
index cc60e15..b61f9e7 100644
--- a/tests/monitor-pp-dynamic.c
+++ b/tests/monitor-pp-dynamic.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/monitor-pp-lower.c b/tests/monitor-pp-lower.c
index d5c8899..4b83d48 100644
--- a/tests/monitor-pp-lower.c
+++ b/tests/monitor-pp-lower.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/monitor-pp-nested.c b/tests/monitor-pp-nested.c
index 892ef46..139948c 100644
--- a/tests/monitor-pp-nested.c
+++ b/tests/monitor-pp-nested.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/monitor-pp-pi.c b/tests/monitor-pp-pi.c
index c5dda64..f6fbc9e 100644
--- a/tests/monitor-pp-pi.c
+++ b/tests/monitor-pp-pi.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/monitor-pp-raise.c b/tests/monitor-pp-raise.c
index 8f45a59..57ccae3 100644
--- a/tests/monitor-pp-raise.c
+++ b/tests/monitor-pp-raise.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/monitor-pp-tryenter.c b/tests/monitor-pp-tryenter.c
index 08eb2e9..fe94bbc 100644
--- a/tests/monitor-pp-tryenter.c
+++ b/tests/monitor-pp-tryenter.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/monitor-pp-weak.c b/tests/monitor-pp-weak.c
index 15f12fa..d63b0cb 100644
--- a/tests/monitor-pp-weak.c
+++ b/tests/monitor-pp-weak.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/monitor-steal.c b/tests/monitor-steal.c
index 0de4563..9731fc6 100644
--- a/tests/monitor-steal.c
+++ b/tests/monitor-steal.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/mutex.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/mutex.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 #define LOW_PRIO	1
diff --git a/tests/poll-close.c b/tests/poll-close.c
index 38ac546..a6e9c95 100644
--- a/tests/poll-close.c
+++ b/tests/poll-close.c
@@ -4,10 +4,10 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <evenless/clock.h>
-#include <evenless/thread.h>
-#include <evenless/xbuf.h>
-#include <evenless/poll.h>
+#include <evl/clock.h>
+#include <evl/thread.h>
+#include <evl/xbuf.h>
+#include <evl/poll.h>
 #include "helpers.h"
 
 static int pfd;
diff --git a/tests/poll-nested.c b/tests/poll-nested.c
index 293071e..131a048 100644
--- a/tests/poll-nested.c
+++ b/tests/poll-nested.c
@@ -8,10 +8,10 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include <evenless/thread.h>
-#include <evenless/clock.h>
-#include <evenless/poll.h>
-#include <evenless/evl.h>
+#include <evl/thread.h>
+#include <evl/clock.h>
+#include <evl/poll.h>
+#include <evl/evl.h>
 #include "helpers.h"
 
 int main(int argc, char *argv[])
diff --git a/tests/poll-read.c b/tests/poll-read.c
index 6e83e9a..07c5df8 100644
--- a/tests/poll-read.c
+++ b/tests/poll-read.c
@@ -8,10 +8,10 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include <evenless/thread.h>
-#include <evenless/xbuf.h>
-#include <evenless/clock.h>
-#include <evenless/poll.h>
+#include <evl/thread.h>
+#include <evl/xbuf.h>
+#include <evl/clock.h>
+#include <evl/poll.h>
 #include "helpers.h"
 
 static const char *msg[] = {
diff --git a/tests/sem-close-unblock.c b/tests/sem-close-unblock.c
index 24b9a3d..7379ca7 100644
--- a/tests/sem-close-unblock.c
+++ b/tests/sem-close-unblock.c
@@ -8,9 +8,9 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 struct test_context {
diff --git a/tests/sem-timedwait.c b/tests/sem-timedwait.c
index 3d578d3..48ec84d 100644
--- a/tests/sem-timedwait.c
+++ b/tests/sem-timedwait.c
@@ -8,9 +8,9 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 struct test_context {
diff --git a/tests/sem-wait.c b/tests/sem-wait.c
index 6c6039a..b20df1d 100644
--- a/tests/sem-wait.c
+++ b/tests/sem-wait.c
@@ -8,9 +8,9 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <evenless/thread.h>
-#include <evenless/clock.h>
-#include <evenless/sem.h>
+#include <evl/thread.h>
+#include <evl/clock.h>
+#include <evl/sem.h>
 #include "helpers.h"
 
 struct test_context {
diff --git a/tests/simple-clone.c b/tests/simple-clone.c
index ccc551d..32b68ff 100644
--- a/tests/simple-clone.c
+++ b/tests/simple-clone.c
@@ -7,7 +7,7 @@
 #include <error.h>
 #include <errno.h>
 #include <unistd.h>
-#include <evenless/thread.h>
+#include <evl/thread.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/utils/hectic.c b/utils/hectic.c
index e032a72..71f0980 100644
--- a/utils/hectic.c
+++ b/utils/hectic.c
@@ -24,9 +24,9 @@
 #include <setjmp.h>
 #include <getopt.h>
 #include <sys/ioctl.h>
-#include <evenless/evl.h>
-#include <uapi/asm/evenless/fptest.h>
-#include <uapi/evenless/devices/hectic.h>
+#include <evl/evl.h>
+#include <uapi/asm/evl/fptest.h>
+#include <uapi/evl/devices/hectic.h>
 
 static unsigned int nr_cpus;
 
diff --git a/utils/latmus.c b/utils/latmus.c
index 4185087..f40c1f6 100644
--- a/utils/latmus.c
+++ b/utils/latmus.c
@@ -23,9 +23,9 @@
 #include <error.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <evenless/evl.h>
-#include <uapi/evenless/devices/latmus.h>
-#include <uapi/evenless/signal.h>
+#include <evl/evl.h>
+#include <uapi/evl/devices/latmus.h>
+#include <uapi/evl/signal.h>
 
 static int test_irqlat, test_klat, test_ulat;