diff --git a/src/server/prot-a.c b/src/server/prot-a.c
index a0ac36dfcd5f31d0ddb79ae913d8bcbcd93b0c25..5871713f711adfd15717abed19ff06b3c0bf51e4 100644
--- a/src/server/prot-a.c
+++ b/src/server/prot-a.c
@@ -36,100 +36,100 @@ prot_a_reply(Connection *client,
 
 	switch ( fnc_defs[ client->function ].result )
 	{
-	case number:
+	case rt_number:
 	    mux_printf(client, " %ld", (u_long)res->number);
 	    BUG(("=%d\n", res->number));
 	    break;
 
-	case success:
+	case rt_success:
 	    BUG(("=Success\n"));
 	    break;
 	    
-	case person:
+	case rt_person:
 	    prot_a_output_person(client, &res->person);
 	    BUG(("={Person struct not listed}\n"));
 	    break;
 
-	case membership:
+	case rt_membership:
 	    prot_a_output_membership(client, &res->membership);
 	    BUG(("={Membership struct not listed}\n"));
 	    break;
 
-	case conf_list:
+	case rt_conf_list:
 	    prot_a_output_conf_list(client, res->conf_list);
 	    BUG(("={Conf_list not listed}\n"));
 	    break;
 
-	case conf_no_list:
+	case rt_conf_no_list:
 	    prot_a_output_conf_no_list(client, res->conf_no_list);
 	    BUG(("={Conf_no_list not listed}\n"));
 	    break;
 	    	    
-	case conference:
+	case rt_conference:
 	    prot_a_output_conference(client, &res->conference);
 	    BUG(("={Conference struct not listed}\n"));
 	    break;
 
-	case string:
+	case rt_string:
 	    prot_a_output_string(client, res->string);
 	    BUG(("={%dH", res->string.len));
 	    BUGSTR(res->string);
 	    BUG(("}\n"));
 	    break;
 	    
-	case mark_list:
+	case rt_mark_list:
 	    prot_a_output_mark_list(client, res->mark_list);
 	    BUG(("={Mark_list not listed}\n"));
 	    break;
 	    
-	case text_stat:
+	case rt_text_stat:
 	    prot_a_output_text_stat(client, &res->text_stat);
 	    BUG(("={Text_stat struct not listed}\n"));
 	    break;
 	    
-	case text_list:
+	case rt_text_list:
 	    prot_a_output_text_list(client, res->text_list);
 	    BUG(("={Text_list not listed}\n"));
 	    break;
 
-	case who_info_list:
+	case rt_who_info_list:
 	    prot_a_output_who_info_list(client, res->who_info_list);
 	    BUG(("={Who_info_list not listed}\n"));
 	    break;
 
-	case who_info_list_old:
+	case rt_who_info_list_old:
 	    prot_a_output_who_info_list_old(client,
 					    res->who_info_list_old);
 	    BUG(("={Old who_info_list not listed}\n"));
 	    break;
 
-	case session_info:
+	case rt_session_info:
 	    prot_a_output_session_info(client,
 				       &res->session_info);
 	    BUG(("={Session_info not listed}\n"));
 	    break;
     
-	case info:
+	case rt_info:
 	    prot_a_output_info(client, &res->info);
 	    BUG(("={Who_info struct not listed}\n"));
 	    break;
 
-	case membership_list:
+	case rt_membership_list:
 	    prot_a_output_membership_list (client, res->membership_list);
 	    BUG (("={Membership_list not listed}\n"));
 	    break;
 	    
-	case member_list:
+	case rt_member_list:
 	    prot_a_output_member_list (client, res->member_list);
 	    BUG(("={Member_list not listed}\n"));
 	    break;
 
-	case time_date:
+	case rt_time_date:
 	    prot_a_output_time (client, res->time_date);
 	    BUG(("=(time_t)%d\n", res->time_date));
 	    break;
 
-	case session_no:
+	case rt_session_no:
 	    prot_a_output_session_no (client, res->session_no);
 	    BUG(("=(Session_no)%d\n", res->session_no));
 	    break;