diff --git a/Makefile b/Makefile
index 02caf81..7d127a2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,11 @@ permit:
 compile:
 	@mkdir -p bin
 	$(CC) src/lib/*.c -o bin/libnecrondaserver.so --shared -fPIC $(CFLAGS) $(LIBS)
-	$(CC) src/necronda-server.c src/client.c -o bin/necronda-server $(CFLAGS) $(LIBS) \
+	$(CC) src/server.c src/client.c -o bin/necronda-server $(CFLAGS) $(LIBS) \
 		-Lbin -lnecrondaserver -Wl,-rpath=$(shell pwd)/bin
 
 compile-prod:
 	@mkdir -p bin
 	$(CC) src/lib/*.c -o bin/libnecrondaserver.so --shared -fPIC $(CFLAGS) $(LIBS) $(DEBIAN_OPTS) -O3
-	$(CC) src/necronda-server.c src/client.c -o bin/necronda-server $(CFLAGS) $(LIBS) $(DEBIAN_OPTS) -O3 \
+	$(CC) src/server.c src/client.c -o bin/necronda-server $(CFLAGS) $(LIBS) $(DEBIAN_OPTS) -O3 \
 		-Lbin -lnecrondaserver -Wl,-rpath=$(shell pwd)/bin
diff --git a/src/client.c b/src/client.c
index 485dbf6..2304180 100644
--- a/src/client.c
+++ b/src/client.c
@@ -7,7 +7,7 @@
 
 #include "client.h"
 #include "necronda.h"
-#include "necronda-server.h"
+#include "server.h"
 
 #include "lib/utils.h"
 #include "lib/config.h"
diff --git a/src/lib/fastcgi.c b/src/lib/fastcgi.c
index 145354d..0d03218 100644
--- a/src/lib/fastcgi.c
+++ b/src/lib/fastcgi.c
@@ -8,7 +8,7 @@
 #include "fastcgi.h"
 #include "utils.h"
 #include "compress.h"
-#include "../necronda-server.h"
+#include "../server.h"
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <errno.h>
diff --git a/src/lib/rev_proxy.c b/src/lib/rev_proxy.c
index 0b7e26f..45e1171 100644
--- a/src/lib/rev_proxy.c
+++ b/src/lib/rev_proxy.c
@@ -8,7 +8,7 @@
 #include "rev_proxy.h"
 #include "utils.h"
 #include "compress.h"
-#include "../necronda-server.h"
+#include "../server.h"
 #include <openssl/ssl.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/necronda-server.c b/src/server.c
similarity index 99%
rename from src/necronda-server.c
rename to src/server.c
index 3376ead..eb37419 100644
--- a/src/necronda-server.c
+++ b/src/server.c
@@ -8,7 +8,7 @@
 #define _POSIX_C_SOURCE 199309L
 
 #include "necronda.h"
-#include "necronda-server.h"
+#include "server.h"
 #include "client.h"
 
 #include "lib/cache.h"
diff --git a/src/necronda-server.h b/src/server.h
similarity index 85%
rename from src/necronda-server.h
rename to src/server.h
index fb75b17..5ba457a 100644
--- a/src/necronda-server.h
+++ b/src/server.h
@@ -5,8 +5,8 @@
  * Lorenz Stechauner, 2020-12-03
  */
 
-#ifndef NECRONDA_SERVER_NECRONDA_SERVER_H
-#define NECRONDA_SERVER_NECRONDA_SERVER_H
+#ifndef NECRONDA_SERVER_SERVER_H
+#define NECRONDA_SERVER_SERVER_H
 
 #include <sys/time.h>
 #include <maxminddb.h>
@@ -31,4 +31,4 @@ extern char *log_client_prefix, *log_conn_prefix, *log_req_prefix, *client_geoip
 extern char *client_addr_str, *client_addr_str_ptr, *server_addr_str, *server_addr_str_ptr, *client_host_str;
 extern struct timeval client_timeout;
 
-#endif //NECRONDA_SERVER_NECRONDA_SERVER_H
+#endif //NECRONDA_SERVER_SERVER_H