diff --git a/Makefile b/Makefile
index bec0d11..501830d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 CFLAGS += -Wall -Wextra -pedantic
 
-all: merd qrap
+all: passt qrap
 
-merd: merd.c merd.h arp.c arp.h dhcp.c dhcp.h util.c util.h
-	$(CC) $(CFLAGS) merd.c arp.c dhcp.c util.c -o merd
+passt: passt.c passt.h arp.c arp.h dhcp.c dhcp.h util.c util.h
+	$(CC) $(CFLAGS) passt.c arp.c dhcp.c util.c -o passt
 
-qrap: qrap.c merd.h
-	$(CC) $(CFLAGS) qrap.o -o qrap
+qrap: qrap.c passt.h
+	$(CC) $(CFLAGS) qrap.c -o qrap
 
 .PHONY: clean
 clean:
-	-${RM} merd qrap
+	-${RM} passt *.o qrap
diff --git a/arp.c b/arp.c
index 1a38912..4646792 100644
--- a/arp.c
+++ b/arp.c
@@ -1,4 +1,4 @@
-/* MERD - MacVTap Egress and Routing Daemon
+/* PASST - Plug A Simple Socket Transport
  *
  * arp.c - ARP implementation
  *
@@ -19,7 +19,7 @@
 #include <net/if_arp.h>
 #include <arpa/inet.h>
 
-#include "merd.h"
+#include "passt.h"
 #include "dhcp.h"
 #include "util.h"
 
diff --git a/dhcp.c b/dhcp.c
index 4be3615..44a7cfe 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -1,6 +1,6 @@
-/* MERD - MacVTap Egress and Routing Daemon
+/* PASST - Plug A Simple Socket Transport
  *
- * dhcp.c - Minimalistic DHCP server for MERD
+ * dhcp.c - Minimalistic DHCP server for PASST
  *
  * Author: Stefano Brivio <sbrivio@redhat.com>
  * License: GPLv2
@@ -18,7 +18,7 @@
 #include <net/if.h>
 #include <arpa/inet.h>
 
-#include "merd.h"
+#include "passt.h"
 #include "dhcp.h"
 #include "util.h"
 
diff --git a/merd.c b/passt.c
similarity index 99%
rename from merd.c
rename to passt.c
index 02cb54e..f5d88d9 100644
--- a/merd.c
+++ b/passt.c
@@ -1,6 +1,6 @@
-/* MERD - MacVTap Egress and Routing Daemon
+/* PASST - Plug A Simple Socket Transport
  *
- * merd.c - Daemon implementation
+ * passt.c - Daemon implementation
  *
  * Author: Stefano Brivio <sbrivio@redhat.com>
  * License: GPLv2
@@ -50,7 +50,7 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
-#include "merd.h"
+#include "passt.h"
 #include "arp.h"
 #include "dhcp.h"
 #include "util.h"
diff --git a/merd.h b/passt.h
similarity index 96%
rename from merd.h
rename to passt.h
index 78e3c0b..402c95d 100644
--- a/merd.h
+++ b/passt.h
@@ -1,5 +1,5 @@
 #define CT_SIZE		4096
-#define UNIX_SOCK_PATH	"/tmp/merd.socket"
+#define UNIX_SOCK_PATH	"/tmp/passt.socket"
 
 /**
  * struct ct4 - IPv4 connection tracking entry
diff --git a/qrap.c b/qrap.c
index b246a7e..06dc5c4 100644
--- a/qrap.c
+++ b/qrap.c
@@ -1,4 +1,4 @@
-/* MERD - MacVTap Egress and Routing Daemon
+/* PASST - Plug A Simple Socket Transport
  *
  * qrap.c - qemu wrapper connecting UNIX domain socket to tap file descriptor
  *
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -17,8 +18,10 @@
 #include <sys/un.h>
 #include <errno.h>
 #include <limits.h>
+#include <linux/if_ether.h>
+#include <net/if.h>
 
-#include "merd.h"
+#include "passt.h"
 
 /**
  * usage() - Print usage and exit
diff --git a/util.c b/util.c
index 23eccb1..aee41a0 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* MERD - MacVTap Egress and Routing Daemon
+/* PASST - Plug A Simple Socket Transport
  *
  * util.c - Convenience helpers
  *