Index: generators/library/Makefile
==================================================================
--- generators/library/Makefile
+++ generators/library/Makefile
@@ -61,15 +61,15 @@
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	rm -f objfw${OBJFW_LIB_MAJOR}.dll; \
 	rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
-	rm -f objfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
 	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../../src/exceptions -I../../src/runtime -I../..
 LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}

Index: generators/unicode/Makefile
==================================================================
--- generators/unicode/Makefile
+++ generators/unicode/Makefile
@@ -58,15 +58,15 @@
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	rm -f objfw${OBJFW_LIB_MAJOR}.dll; \
 	rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
-	rm -f objfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
 	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../../src/exceptions -I../../src/runtime -I../..
 LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}

Index: tests/objc_sync/Makefile
==================================================================
--- tests/objc_sync/Makefile
+++ tests/objc_sync/Makefile
@@ -60,12 +60,13 @@
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	rm -f objfw${OBJFW_LIB_MAJOR}.dll; \
 	rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
-	rm -f objfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} objfwrt.dll; \
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
+	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 
 CPPFLAGS += -I../../src -I../../src/runtime -I../..
 LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}

Index: tests/terminal/Makefile
==================================================================
--- tests/terminal/Makefile
+++ tests/terminal/Makefile
@@ -9,11 +9,11 @@
 
 .PHONY: run
 run:
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
-	rm -f objfw${LIBOBJFW_MAJOR}.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
+	rm -f objfw${OBJFW_LIB_MAJOR}.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}
 	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib
 	rm -f ${OBJFWRT_AMIGA_LIB}
@@ -60,13 +60,13 @@
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	rm -f objfw${OBJFW_LIB_MAJOR}.dll; \
 	rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
-	rm -f objfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
 	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 
 CPPFLAGS += -I../../src -I../../src/exceptions -I../../src/runtime -I../..
 LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}