@@ -1450,65 +1450,65 @@
 			#ifdef AF_IPX
 			egrep_cpp_yes
 			#endif
 		], [
 			AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
-			AC_SUBST(OFIPXSOCKET_M, OFIPXSocket.m)
-			AC_SUBST(OFIPXSOCKETTESTS_M, OFIPXSocketTests.m)
-			AC_SUBST(OFSPXSOCKET_M, OFSPXSocket.m)
-			AC_SUBST(OFSPXSOCKETTESTS_M, OFSPXSocketTests.m)
+			AC_SUBST(OF_IPX_SOCKET_M, OFIPXSocket.m)
+			AC_SUBST(OF_IPX_SOCKET_TESTS_M, OFIPXSocketTests.m)
+			AC_SUBST(OF_SPX_SOCKET_M, OFSPXSocket.m)
+			AC_SUBST(OF_SPX_SOCKET_TESTS_M, OFSPXSocketTests.m)
 		])
 	])
 
 	AC_CHECK_FUNCS(paccept accept4, break)
 
 	AC_CHECK_FUNCS(kqueue1 kqueue, [
 		AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue])
-		AC_SUBST(OFKQUEUEKERNELEVENTOBSERVER_M,
+		AC_SUBST(OF_KQUEUE_KERNEL_EVENT_OBSERVER_M,
 			"OFKqueueKernelEventObserver.m")
 		break
 	])
 	AC_CHECK_FUNCS(epoll_create1 epoll_create, [
 		AC_DEFINE(HAVE_EPOLL, 1, [Whether we have epoll])
-		AC_SUBST(OFEPOLLKERNELEVENTOBSERVER_M,
+		AC_SUBST(OF_EPOLL_KERNEL_EVENT_OBSERVER_M,
 			"OFEpollKernelEventObserver.m")
 		break
 	])
 
 	AS_IF([test x"$with_wii" = x"yes"], [
 		AC_DEFINE(HAVE_POLL, 1, [Whether we have poll()])
-		AC_SUBST(OFPOLLKERNELEVENTOBSERVER_M,
+		AC_SUBST(OF_POLL_KERNEL_EVENT_OBSERVER_M,
 			"OFPollKernelEventObserver.m")
 	], [
 		AC_CHECK_HEADERS(poll.h)
 		AC_CHECK_FUNC(poll, [
 			AC_DEFINE(HAVE_POLL, 1, [Whether we have poll()])
-			AC_SUBST(OFPOLLKERNELEVENTOBSERVER_M,
+			AC_SUBST(OF_POLL_KERNEL_EVENT_OBSERVER_M,
 				"OFPollKernelEventObserver.m")
 		])
 	])
 
 	case "$host_os" in
 		amigaos* | mingw* | morphos*)
 			AC_DEFINE(HAVE_SELECT, 1,
 				[Whether we have select() or similar])
-			AC_SUBST(OFSELECTKERNELEVENTOBSERVER_M,
+			AC_SUBST(OF_SELECT_KERNEL_EVENT_OBSERVER_M,
 				"OFSelectKernelEventObserver.m")
 			;;
 		*)
 			AC_CHECK_HEADERS(sys/select.h)
 			AC_CHECK_FUNC(select, [
 				AC_DEFINE(HAVE_SELECT, 1,
 					[Whether we have select() or similar])
-				AC_SUBST(OFSELECTKERNELEVENTOBSERVER_M,
+				AC_SUBST(OF_SELECT_KERNEL_EVENT_OBSERVER_M,
 					"OFSelectKernelEventObserver.m")
 			])
 			;;
 	esac
 
 	AS_IF([test x"$enable_threads" != x"no"], [
-		AC_SUBST(OFHTTPCLIENTTESTS_M, "OFHTTPClientTests.m")
+		AC_SUBST(OF_HTTP_CLIENT_TESTS_M, "OFHTTPClientTests.m")
 	])
 
 	AC_SUBST(OFDNS, "ofdns")
 	AS_IF([test x"$enable_files" != x"no"], [
 		AC_SUBST(OFHTTP, "ofhttp")
@@ -1571,11 +1571,11 @@
 			])
 		])
 		;;
 esac
 AS_IF([test x"$have_processes" = x"yes"], [
-	AC_SUBST(OFPROCESS_M, "OFProcess.m")
+	AC_SUBST(OF_PROCESS_M, "OFProcess.m")
 	AC_DEFINE(OF_HAVE_PROCESSES, 1, [Whether we have processes])
 ])
 
 AC_CHECK_HEADERS_ONCE([complex.h sys/ioctl.h sys/ttycom.h])
 
@@ -1611,11 +1611,11 @@
 AC_TRY_COMPILE([], [
 	int (^foo)(int bar);
 	foo = ^ (int bar) { return 0; }
 ], [
 	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -Xclang -fblocks"
-	AC_SUBST(OFBLOCKTESTS_M, "OFBlockTests.m")
+	AC_SUBST(OF_BLOCK_TESTS_M, "OFBlockTests.m")
 	AC_MSG_RESULT(yes)
 ], [
 	AC_MSG_RESULT(no)
 	OBJCFLAGS="$old_OBJCFLAGS"
 ])