@@ -1306,48 +1306,48 @@
 
 	AC_CHECK_FUNCS(paccept accept4, break)
 
 	AC_CHECK_FUNCS(kqueue1 kqueue, [
 		AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue])
-		AC_SUBST(OFKERNELEVENTOBSERVER_KQUEUE_M,
-			"OFKernelEventObserver_kqueue.m")
+		AC_SUBST(OFKQUEUEKERNELEVENTOBSERVER_M,
+			"OFKqueueKernelEventObserver.m")
 		break
 	])
 	AC_CHECK_FUNCS(epoll_create1 epoll_create, [
 		AC_DEFINE(HAVE_EPOLL, 1, [Whether we have epoll])
-		AC_SUBST(OFKERNELEVENTOBSERVER_EPOLL_M,
-			"OFKernelEventObserver_epoll.m")
+		AC_SUBST(OFEPOLLKERNELEVENTOBSERVER_M,
+			"OFEpollKernelEventObserver.m")
 		break
 	])
 
 	AS_IF([test x"$with_wii" = x"yes"], [
 		AC_DEFINE(HAVE_POLL, 1, [Whether we have poll()])
-		AC_SUBST(OFKERNELEVENTOBSERVER_POLL_M,
-			"OFKernelEventObserver_poll.m")
+		AC_SUBST(OFPOLLKERNELEVENTOBSERVER_M,
+			"OFPollKernelEventObserver.m")
 	], [
 		AC_CHECK_HEADERS(poll.h)
 		AC_CHECK_FUNC(poll, [
 			AC_DEFINE(HAVE_POLL, 1, [Whether we have poll()])
-			AC_SUBST(OFKERNELEVENTOBSERVER_POLL_M,
-				"OFKernelEventObserver_poll.m")
+			AC_SUBST(OFPOLLKERNELEVENTOBSERVER_M,
+				"OFPollKernelEventObserver.m")
 		])
 	])
 
 	case "$host_os" in
 		mingw* | morphos*)
 			AC_DEFINE(HAVE_SELECT, 1,
 				[Whether we have select() or similar])
-			AC_SUBST(OFKERNELEVENTOBSERVER_SELECT_M,
-				"OFKernelEventObserver_select.m")
+			AC_SUBST(OFSELECTKERNELEVENTOBSERVER_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(OFKERNELEVENTOBSERVER_SELECT_M,
-					"OFKernelEventObserver_select.m")
+				AC_SUBST(OFSELECTKERNELEVENTOBSERVER_M,
+					"OFSelectKernelEventObserver.m")
 			])
 			;;
 	esac
 
 	AS_IF([test x"$enable_threads" != x"no"], [