diff --git a/.gitignore b/.gitignore
index d9f3bb3..2d89b51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,5 +52,5 @@ Mkfile.old
 dkms.conf
 
 # Binaries generated by the program
-bad
+cdba-server
 cdba
diff --git a/Makefile b/Makefile
index 9a6695b..93e38b6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CLIENT := cdba
-CDBA := bad
+CDBA := cdba-server
 
 .PHONY: all
 
@@ -11,7 +11,7 @@ LDFLAGS := -ludev -lyaml
 CLIENT_SRCS := cdba.c circ_buf.c
 CLIENT_OBJS := $(CLIENT_SRCS:.c=.o)
 
-CDBA_SRCS := bad.c cdb_assist.c circ_buf.c conmux.c device.c device_parser.c fastboot.c alpaca.c
+CDBA_SRCS := cdba-server.c cdb_assist.c circ_buf.c conmux.c device.c device_parser.c fastboot.c alpaca.c
 CDBA_OBJS := $(CDBA_SRCS:.c=.o)
 
 $(CLIENT): $(CLIENT_OBJS)
diff --git a/README b/README
index e282ccf..22c1fdb 100644
--- a/README
+++ b/README
@@ -7,8 +7,8 @@ sudo apt-get install libudev-dev libyaml-dev for debian systems
 dnf install systemd-devel libyaml-devel for fedora systems
 
 = Device side
-On the host with the CDB Assist or Conmux attached the "bad" executable is run
-from sandbox/cdba/bad. Available devices are read from $HOME/.cdba
+On the host with the CDB Assist or Conmux attached the "cdba-server" executable is run
+from sandbox/cdba/cdba-server. Available devices are read from $HOME/.cdba
 
 = Client side
 The client is invoked as:
diff --git a/alpaca.c b/alpaca.c
index 2f69a0a..f522a64 100644
--- a/alpaca.c
+++ b/alpaca.c
@@ -41,7 +41,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "bad.h"
+#include "cdba-server.h"
 #include "alpaca.h"
 
 struct alpaca {
diff --git a/cdb_assist.c b/cdb_assist.c
index 34ae1ec..2ffbdd1 100644
--- a/cdb_assist.c
+++ b/cdb_assist.c
@@ -41,7 +41,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "bad.h"
+#include "cdba-server.h"
 #include "cdb_assist.h"
 
 struct cdb_assist {
diff --git a/bad.c b/cdba-server.c
similarity index 99%
rename from bad.c
rename to cdba-server.c
index bf0388a..9104f95 100644
--- a/bad.c
+++ b/cdba-server.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "bad.h"
+#include "cdba-server.h"
 #include "circ_buf.h"
 #include "device.h"
 #include "device_parser.h"
diff --git a/bad.h b/cdba-server.h
similarity index 100%
rename from bad.h
rename to cdba-server.h
diff --git a/cdba.c b/cdba.c
index e736836..2b08869 100644
--- a/cdba.c
+++ b/cdba.c
@@ -549,7 +549,7 @@ int main(int argc, char **argv)
 
 	request_select_board(board);
 
-	ret = fork_ssh(host, "sandbox/cdba/bad", ssh_fds);
+	ret = fork_ssh(host, "sandbox/cdba/cdba-server", ssh_fds);
 	if (ret)
 		err(1, "failed to connect to \"%s\"", host);
 
diff --git a/conmux.c b/conmux.c
index 050b70c..669e180 100644
--- a/conmux.c
+++ b/conmux.c
@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "bad.h"
+#include "cdba-server.h"
 #include "conmux.h"
 
 extern int h_errno;
diff --git a/fastboot.c b/fastboot.c
index d332897..51f072d 100644
--- a/fastboot.c
+++ b/fastboot.c
@@ -44,7 +44,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "bad.h"
+#include "cdba-server.h"
 #include "fastboot.h"
 
 #define MAX_USBFS_BULK_SIZE (16*1024)