diff --git a/src/ircd.c b/src/ircd.c
index 0d39431..aab1d45 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -649,22 +649,22 @@ main(int argc, char *argv[])
 
 	ilog(L_MAIN, "Server Ready");
 
-	eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
+	rb_event_addish("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
 
 	/* We want try_connections to be called as soon as possible now! -- adrian */
 	/* No, 'cause after a restart it would cause all sorts of nick collides */
 	/* um.  by waiting even longer, that just means we have even *more*
 	 * nick collisions.  what a stupid idea. set an event for the IO loop --fl
 	 */
-	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
-	eventAddOnce("try_connections_startup", try_connections, NULL, 0);
+	rb_event_addish("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
+	rb_event_addonce("try_connections_startup", try_connections, NULL, 0);
 
-	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
+	rb_event_addish("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
 
 	/* Setup the timeout check. I'll shift it later :)  -- adrian */
-	eventAddIsh("rb_checktimeouts", rb_checktimeouts, NULL, 1);
+	rb_event_addish("rb_checktimeouts", rb_checktimeouts, NULL, 1);
 
-	eventAdd("check_rehash", check_rehash, NULL, 1);
+	rb_event_add("check_rehash", check_rehash, NULL, 1);
 
 	if(splitmode)
 		check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 2);
diff --git a/src/reject.c b/src/reject.c
index a437449..02ddfb8 100644
--- a/src/reject.c
+++ b/src/reject.c
@@ -112,8 +112,8 @@ init_reject(void)
 {
 	reject_tree = New_Patricia(PATRICIA_BITS);
 	unknown_tree = New_Patricia(PATRICIA_BITS);
-	eventAdd("reject_exit", reject_exit, NULL, DELAYED_EXIT_TIME);
-	eventAdd("reject_expires", reject_expires, NULL, 60);
+	rb_event_add("reject_exit", reject_exit, NULL, DELAYED_EXIT_TIME);
+	rb_event_add("reject_expires", reject_expires, NULL, 60);
 }
 
 
diff --git a/src/res.c b/src/res.c
index fff5abc..f61485e 100644
--- a/src/res.c
+++ b/src/res.c
@@ -231,7 +231,7 @@ static void start_resolver(void)
 
 		/* At the moment, the resolver FD data is global .. */
 		rb_setselect(res_fd, FDLIST_NONE, COMM_SELECT_READ, res_readreply, NULL, 0);
-		eventAdd("timeout_resolver", timeout_resolver, NULL, 1);
+		rb_event_add("timeout_resolver", timeout_resolver, NULL, 1);
 	}
 }
 
diff --git a/src/s_auth.c b/src/s_auth.c
index dc3aecd..d245470 100644
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -102,7 +102,7 @@ init_auth(void)
 {
 	/* This hook takes a struct Client for its argument */
 	memset(&auth_poll_list, 0, sizeof(auth_poll_list));
-	eventAddIsh("timeout_auth_queries_event", timeout_auth_queries_event, NULL, 1);
+	rb_event_addish("timeout_auth_queries_event", timeout_auth_queries_event, NULL, 1);
 	auth_heap = rb_bh_create(sizeof(struct AuthRequest), LCLIENT_HEAP_SIZE);
 }
 
diff --git a/src/s_conf.c b/src/s_conf.c
index cb27d7b..f45601f 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -85,20 +85,20 @@ init_s_conf(void)
 {
 	confitem_heap = rb_bh_create(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE);
 
-	eventAddIsh("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
-	eventAddIsh("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
+	rb_event_addish("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
+	rb_event_addish("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
 
-	eventAddIsh("expire_temp_klines_hour", reorganise_temp_kd,
+	rb_event_addish("expire_temp_klines_hour", reorganise_temp_kd,
 			&temp_klines[TEMP_HOUR], 3600);
-	eventAddIsh("expire_temp_dlines_hour", reorganise_temp_kd,
+	rb_event_addish("expire_temp_dlines_hour", reorganise_temp_kd,
 			&temp_dlines[TEMP_HOUR], 3600);
-	eventAddIsh("expire_temp_klines_day", reorganise_temp_kd,
+	rb_event_addish("expire_temp_klines_day", reorganise_temp_kd,
 			&temp_klines[TEMP_DAY], 86400);
-	eventAddIsh("expire_temp_dlines_day", reorganise_temp_kd,
+	rb_event_addish("expire_temp_dlines_day", reorganise_temp_kd,
 			&temp_dlines[TEMP_DAY], 86400);
-	eventAddIsh("expire_temp_klines_week", reorganise_temp_kd,
+	rb_event_addish("expire_temp_klines_week", reorganise_temp_kd,
 			&temp_klines[TEMP_WEEK], 604800);
-	eventAddIsh("expire_temp_dlines_week", reorganise_temp_kd,
+	rb_event_addish("expire_temp_dlines_week", reorganise_temp_kd,
 			&temp_dlines[TEMP_WEEK], 604800);
 }
 
diff --git a/src/s_newconf.c b/src/s_newconf.c
index 8fa1b0d..141839c 100644
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -68,8 +68,8 @@ init_s_newconf(void)
 {
 	tgchange_tree = New_Patricia(PATRICIA_BITS);
 	nd_heap = rb_bh_create(sizeof(struct nd_entry), ND_HEAP_SIZE);
-	eventAddIsh("expire_nd_entries", expire_nd_entries, NULL, 30);
-	eventAddIsh("expire_temp_rxlines", expire_temp_rxlines, NULL, 60);
+	rb_event_addish("expire_nd_entries", expire_nd_entries, NULL, 30);
+	rb_event_addish("expire_temp_rxlines", expire_temp_rxlines, NULL, 60);
 }
 
 void