Index: channels/chan_zap.c
===================================================================
--- channels/chan_zap.c	(revision 67990)
+++ channels/chan_zap.c	(working copy)
@@ -11350,7 +11350,7 @@
 		if (tmp->channel > 0) {
 			int alarm = get_alarms(tmp);
 			astman_append(s,
-				"Event: ZapShowChannels\r\n"
+				"Response: ZapShowChannels\r\n"
 				"Channel: %d\r\n"
 				"Signalling: %s\r\n"
 				"Context: %s\r\n"
@@ -11369,7 +11369,7 @@
 	ast_mutex_unlock(&iflock);
 	
 	astman_append(s, 
-		"Event: ZapShowChannelsComplete\r\n"
+		"Response: ZapShowChannelsComplete\r\n"
 		"%s"
 		"\r\n", 
 		idText);
Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 67990)
+++ channels/chan_sip.c	(working copy)
@@ -10344,8 +10344,7 @@
 	_sip_show_peers(-1, &total, s, m, 3, a);
 	/* Send final confirmation */
 	astman_append(s,
-	"Event: PeerlistComplete\r\n"
-	"EventList: Complete\r\n"
+	"Response: PeerlistComplete\r\n"
 	"ListItems: %d\r\n"
 	"%s"
 	"\r\n", total, idtext);
@@ -10451,7 +10450,7 @@
 		} else {	/* Manager format */
 			/* The names here need to be the same as other channels */
 			astman_append(s, 
-			"Event: PeerEntry\r\n%s"
+			"Response: PeerEntry\r\n%s"
 			"Channeltype: SIP\r\n"
 			"ObjectName: %s\r\n"
 			"ChanObjectType: peer\r\n"	/* "peer" or "user" */
Index: channels/chan_agent.c
===================================================================
--- channels/chan_agent.c	(revision 67990)
+++ channels/chan_agent.c	(working copy)
@@ -1451,7 +1451,7 @@
 			status = "AGENT_LOGGEDOFF";
 		}
 
-		astman_append(s, "Event: Agents\r\n"
+		astman_append(s, "Response: Agents\r\n"
 			"Agent: %s\r\n"
 			"Name: %s\r\n"
 			"Status: %s\r\n"
@@ -1464,7 +1464,7 @@
 		ast_mutex_unlock(&p->lock);
 	}
 	AST_LIST_UNLOCK(&agents);
-	astman_append(s, "Event: AgentsComplete\r\n"
+	astman_append(s, "Response: AgentsComplete\r\n"
 		"%s"
 		"\r\n",idText);
 	return 0;
Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 67990)
+++ apps/app_voicemail.c	(working copy)
@@ -7570,7 +7570,7 @@
 		make_dir(dirname, sizeof(dirname), vmu->context, vmu->mailbox, "INBOX");
 		astman_append(s,
 			      "%s"
-			      "Event: VoicemailUserEntry\r\n"
+			      "Response: VoicemailUserEntry\r\n"
 			      "VMContext: %s\r\n"
 			      "VoiceMailbox: %s\r\n"
 			      "Fullname: %s\r\n"
@@ -7604,7 +7604,7 @@
 #endif
 			);
 	}		
-	astman_append(s, "Event: VoicemailUserEntryComplete\r\n%s\r\n", actionid);
+	astman_append(s, "Response: VoicemailUserEntryComplete\r\n%s\r\n", actionid);
 
 	AST_LIST_UNLOCK(&users);
 
Index: apps/app_queue.c
===================================================================
--- apps/app_queue.c	(revision 67990)
+++ apps/app_queue.c	(working copy)
@@ -4317,7 +4317,7 @@
 			for (qe = q->head; qe; qe = qe->next) {
 				++qchancount;
 			}
-			astman_append(s, "Event: QueueSummary\r\n"
+			astman_append(s, "Response: QueueSummary\r\n"
 				"Queue: %s\r\n"
 				"LoggedIn: %d\r\n"
 				"Available: %d\r\n"
@@ -4330,7 +4330,7 @@
 		ast_mutex_unlock(&q->lock);
 	}
 	astman_append(s,
-		"Event: QueueSummaryComplete\r\n"
+		"Response: QueueSummaryComplete\r\n"
 		"%s"
 		"\r\n", idText);
 
@@ -4366,7 +4366,7 @@
 		if (ast_strlen_zero(queuefilter) || !strcmp(q->name, queuefilter)) {
 			if (q->callscompleted > 0)
 				sl = 100 * ((float) q->callscompletedinsl / (float) q->callscompleted);
-			astman_append(s, "Event: QueueParams\r\n"
+			astman_append(s, "Response: QueueParams\r\n"
 				"Queue: %s\r\n"
 				"Max: %d\r\n"
 				"Strategy: %s\r\n"
@@ -4384,7 +4384,7 @@
 			/* List Queue Members */
 			for (mem = q->members; mem; mem = mem->next) {
 				if (ast_strlen_zero(memberfilter) || !strcmp(mem->interface, memberfilter)) {
-					astman_append(s, "Event: QueueMember\r\n"
+					astman_append(s, "Response: QueueMember\r\n"
 						"Queue: %s\r\n"
 						"Location: %s\r\n"
 						"Membership: %s\r\n"
@@ -4402,7 +4402,7 @@
 			/* List Queue Entries */
 			pos = 1;
 			for (qe = q->head; qe; qe = qe->next) {
-				astman_append(s, "Event: QueueEntry\r\n"
+				astman_append(s, "Response: QueueEntry\r\n"
 					"Queue: %s\r\n"
 					"Position: %d\r\n"
 					"Channel: %s\r\n"
@@ -4421,7 +4421,7 @@
 	}
 
 	astman_append(s,
-		"Event: QueueStatusComplete\r\n"
+		"Response: QueueStatusComplete\r\n"
 		"%s"
 		"\r\n",idText);
 
Index: main/manager.c
===================================================================
--- main/manager.c	(revision 67990)
+++ main/manager.c	(working copy)
@@ -1371,7 +1371,7 @@
 			s->last_ev = unref_event(s->last_ev);
 		}
 		astman_append(s,
-			"Event: WaitEventComplete\r\n"
+			"Response: WaitEventComplete\r\n"
 			"%s"
 			"\r\n", idText);
 		s->waiting_thread = AST_PTHREADT_NULL;
@@ -1619,7 +1619,7 @@
 				elapsed_seconds = now.tv_sec - c->cdr->start.tv_sec;
 			}
 			astman_append(s,
-			"Event: Status\r\n"
+			"Response: ChannelStatus\r\n"
 			"Privilege: Call\r\n"
 			"Channel: %s\r\n"
 			"CallerIDNum: %s\r\n"
@@ -1642,7 +1642,7 @@
 			c->exten, c->priority, (long)elapsed_seconds, bridge, c->uniqueid, idText);
 		} else {
 			astman_append(s,
-			"Event: Status\r\n"
+			"Response: ChannelStatus\r\n"
 			"Privilege: Call\r\n"
 			"Channel: %s\r\n"
 			"CallerIDNum: %s\r\n"
@@ -1665,7 +1665,7 @@
 		c = ast_channel_walk_locked(c);
 	}
 	astman_append(s,
-	"Event: StatusComplete\r\n"
+	"Response: StatusComplete\r\n"
 	"%s"
 	"\r\n",idText);
 	return 0;
Index: main/db.c
===================================================================
--- main/db.c	(revision 67990)
+++ main/db.c	(working copy)
@@ -580,7 +580,7 @@
 		astman_send_error(s, m, "Database entry not found");
 	} else {
 		astman_send_ack(s, m, "Result will follow");
-		astman_append(s, "Event: DBGetResponse\r\n"
+		astman_append(s, "Response: DBGetResponse\r\n"
 				"Family: %s\r\n"
 				"Key: %s\r\n"
 				"Val: %s\r\n"
Index: main/pbx.c
===================================================================
--- main/pbx.c	(revision 67990)
+++ main/pbx.c	(working copy)
@@ -3681,7 +3681,7 @@
 				dpc->total_prio++;
 				if (!dpc->total_items++)
 					manager_dpsendack(s, m);
-				astman_append(s, "Event: ListDialplan\r\n%s", actionidtext);
+				astman_append(s, "Response: ListDialplan\r\n%s", actionidtext);
 				astman_append(s, "Context: %s\r\nExtension: %s\r\n", ast_get_context_name(c), ast_get_extension_name(e) );
 
 				/* XXX maybe make this conditional, if p != e ? */
@@ -3705,7 +3705,7 @@
 			} else {
 				if (!dpc->total_items++)
 					manager_dpsendack(s, m);
-				astman_append(s, "Event: ListDialplan\r\n%s", actionidtext);
+				astman_append(s, "Response: ListDialplan\r\n%s", actionidtext);
 				astman_append(s, "Context: %s\r\nIncludeContext: %s\r\nRegistrar: %s\r\n", ast_get_context_name(c), ast_get_include_name(i), ast_get_include_registrar(i));
 				astman_append(s, "\r\n");
 				if (option_debug > 2)
@@ -3722,7 +3722,7 @@
 			if (!exten || ast_extension_match(ignorepat, exten)) {
 				if (!dpc->total_items++)
 					manager_dpsendack(s, m);
-				astman_append(s, "Event: ListDialplan\r\n%s", actionidtext);
+				astman_append(s, "Response: ListDialplan\r\n%s", actionidtext);
 				astman_append(s, "Context: %s\r\nIgnorePattern: %s\r\nRegistrar: %s\r\n", ast_get_context_name(c), ipname, ast_get_ignorepat_registrar(ip));
 				astman_append(s, "\r\n");
 			}
@@ -3732,7 +3732,7 @@
 			while ( (sw = ast_walk_context_switches(c, sw)) ) {
 				if (!dpc->total_items++)
 					manager_dpsendack(s, m);
-				astman_append(s, "Event: ListDialplan\r\n%s", actionidtext);
+				astman_append(s, "Response: ListDialplan\r\n%s", actionidtext);
 				astman_append(s, "Context: %s\r\nSwitch: %s/%s\r\nRegistrar: %s\r\n", ast_get_context_name(c), ast_get_switch_name(sw), ast_get_switch_data(sw), ast_get_switch_registrar(sw));	
 				astman_append(s, "\r\n");
 				if (option_debug > 2)
Index: res/res_features.c
===================================================================
--- res/res_features.c	(revision 67990)
+++ res/res_features.c	(working copy)
@@ -2469,7 +2469,7 @@
 	ast_mutex_lock(&parking_lock);
 
 	for (cur = parkinglot; cur; cur = cur->next) {
-		astman_append(s, "Event: ParkedCall\r\n"
+		astman_append(s, "Response: ParkedCall\r\n"
 			"Exten: %d\r\n"
 			"Channel: %s\r\n"
 			"From: %s\r\n"
@@ -2486,7 +2486,7 @@
 	}
 
 	astman_append(s,
-		"Event: ParkedCallsComplete\r\n"
+		"Response: ParkedCallsComplete\r\n"
 		"%s"
 		"\r\n",idText);