@@ -6,14 +6,14 @@
 .PHONY: run
 run: all
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
 	rm -f libobjfw.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
-	rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR}
-	rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR}
-	rm -f libobjfw_rt.dll libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib
-	rm -f ${OBJFW_RT_AMIGA_LIB}
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}
+	rm -f libobjfwrt.dll libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib
+	rm -f ${OBJFWRT_AMIGA_LIB}
 	if test -f ../src/libobjfw.so; then \
 		${LN_S} ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
 		${LN_S} ../src/libobjfw.so \
 		    libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
@@ -25,28 +25,28 @@
 	fi
 	if test -f ../src/libobjfw.dylib; then \
 		${LN_S} ../src/libobjfw.dylib \
 		    libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	fi
-	if test -f ../src/runtime/libobjfw_rt.so; then \
-		${LN_S} ../src/runtime/libobjfw_rt.so \
-		    libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR}; \
-		${LN_S} ../src/runtime/libobjfw_rt.so \
-		    libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR}; \
-	elif test -f ../src/runtime/libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR}; then \
-		${LN_S} ../src/runtime/libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR} libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR}; \
-	fi
-	if test -f ../src/runtime/libobjfw_rt.dll; then \
-		${LN_S} ../src/runtime/libobjfw_rt.dll libobjfw_rt.dll; \
-	fi
-	if test -f ../src/runtime/libobjfw_rt.dylib; then \
-		${LN_S} ../src/runtime/libobjfw_rt.dylib \
-		    libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib; \
-	fi
-	if test -f ../src/runtime/${OBJFW_RT_AMIGA_LIB}; then \
-		${LN_S} ../src/runtime/${OBJFW_RT_AMIGA_LIB} \
-		    ${OBJFW_RT_AMIGA_LIB}; \
+	if test -f ../src/runtime/libobjfwrt.so; then \
+		${LN_S} ../src/runtime/libobjfwrt.so \
+		    libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
+		${LN_S} ../src/runtime/libobjfwrt.so \
+		    libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
+	elif test -f ../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; then \
+		${LN_S} ../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
+	fi
+	if test -f ../src/runtime/libobjfwrt.dll; then \
+		${LN_S} ../src/runtime/libobjfwrt.dll libobjfwrt.dll; \
+	fi
+	if test -f ../src/runtime/libobjfwrt.dylib; then \
+		${LN_S} ../src/runtime/libobjfwrt.dylib \
+		    libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
+	fi
+	if test -f ../src/runtime/${OBJFWRT_AMIGA_LIB}; then \
+		${LN_S} ../src/runtime/${OBJFWRT_AMIGA_LIB} \
+		    ${OBJFWRT_AMIGA_LIB}; \
 	fi
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_FRAMEWORK_PATH=../src:../src/runtime$${DYLD_FRAMEWORK_PATH+:}$$DYLD_FRAMEWORK_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
 	LIBRARY_PATH=.$${LIBRARY_PATH+:}$$LIBRARY_PATH \
@@ -53,15 +53,15 @@
 	ASAN_OPTIONS=allocator_may_return_null=1 \
 	${WRAPPER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} libobjfw.dll; \
 	rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
-	rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR}; \
-	rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR} libobjfw_rt.dll; \
-	rm -f libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib; \
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} libobjfwrt.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}