diff --git a/makefile b/makefile
index 679bc3a64865899c09f3df185ee84f9e6e56e598..84f5484b777b362d74e220244bcd90caf05bba72 100644
--- a/makefile
+++ b/makefile
@@ -80,23 +80,23 @@ stop-server-screen:
 	@screen -S caosdb-screen -p server -X stuff "^C"
 
 run-debug-screen:
-	@if test "$$(screen -ls | grep -c 'caosdb-screen')" -eq "1"; then \
+	@if test "$$(screen -ls | grep -c 'caosdb-debug-screen')" -eq "1"; then \
 		echo "server is probably running. try 'screen -ls'"; \
 		exit 1 ; \
 	fi
 	# start and wait for server
-	@screen -L -S caosdb-screen -t server -d -m -A make run-debug
+	@screen -L -S caosdb-debug-screen -t server -d -m -A make run-debug
 	@sleep 2
 	@while [ 1 -eq 1 ] ; do \
-		screen -S caosdb-screen -X hardcopy .screen.log || break ; \
+		screen -S caosdb-debug-screen -X hardcopy .screen.log || break ; \
 		[ $$(grep -c "org.restlet.ext.jetty.JettyServerHelper start" .screen.log) -eq 0 ] || break ; \
 	done; \
 
 
 stop-debug-screen:
 	# stop screen session with debug server
-	@screen -S caosdb-screen -X hardcopy screen.log || true
-	@screen -S caosdb-screen -p server -X stuff "^C"
+	@screen -S caosdb-debug-screen -X hardcopy screen.log || true
+	@screen -S caosdb-debug-screen -p server -X stuff "^C"
 
 .m2-local:
 	mkdir .m2-local