Index: apps/app_meetme.c
===================================================================
--- apps/app_meetme.c	(revision 43183)
+++ apps/app_meetme.c	(working copy)
@@ -1918,8 +1918,8 @@
 				      "Uniqueid: %s\r\n"
 				      "Meetme: %s\r\n"
 				      "Usernum: %d\r\n"
-				      "CallerIDnum: %s\r\n"
-				      "CallerIDname: %s\r\n"
+				      "CallerIDNum: %s\r\n"
+				      "CallerIDName: %s\r\n"
 				      "Duration: %ld\r\n",
 				      chan->name, chan->uniqueid, conf->confno, 
 				      user->user_no,
Index: apps/app_dumpchan.c
===================================================================
--- apps/app_dumpchan.c	(revision 43183)
+++ apps/app_dumpchan.c	(working copy)
@@ -82,7 +82,7 @@
 			 "Name=               %s\n"
 			 "Type=               %s\n"
 			 "UniqueID=           %s\n"
-			 "CallerID=           %s\n"
+			 "CallerIDNum=        %s\n"
 			 "CallerIDName=       %s\n"
 			 "DNIDDigits=         %s\n"
 			 "RDNIS=              %s\n" 
Index: apps/app_dial.c
===================================================================
--- apps/app_dial.c	(revision 43183)
+++ apps/app_dial.c	(working copy)
@@ -373,11 +373,10 @@
 
 static void senddialevent(struct ast_channel *src, struct ast_channel *dst)
 {
-	/* XXX do we need also CallerIDnum ? */
 	manager_event(EVENT_FLAG_CALL, "Dial", 
 			   "Source: %s\r\n"
 			   "Destination: %s\r\n"
-			   "CallerID: %s\r\n"
+			   "CallerIDNum: %s\r\n"
 			   "CallerIDName: %s\r\n"
 			   "SrcUniqueID: %s\r\n"
 			   "DestUniqueID: %s\r\n",
Index: apps/app_queue.c
===================================================================
--- apps/app_queue.c	(revision 43183)
+++ apps/app_queue.c	(working copy)
@@ -1647,7 +1647,7 @@
 		manager_event(EVENT_FLAG_AGENT, "AgentCalled",
 					"AgentCalled: %s\r\n"
 					"ChannelCalling: %s\r\n"
-					"CallerID: %s\r\n"
+					"CallerIDNum: %s\r\n"
 					"CallerIDName: %s\r\n"
 					"Context: %s\r\n"
 					"Extension: %s\r\n"
@@ -4049,7 +4049,7 @@
 					"Queue: %s\r\n"
 					"Position: %d\r\n"
 					"Channel: %s\r\n"
-					"CallerID: %s\r\n"
+					"CallerIDNum: %s\r\n"
 					"CallerIDName: %s\r\n"
 					"Wait: %ld\r\n"
 					"%s"
Index: main/channel.c
===================================================================
--- main/channel.c	(revision 43183)
+++ main/channel.c	(working copy)
@@ -2814,7 +2814,7 @@
 			manager_event(EVENT_FLAG_CALL, "Newchannel",
 				      "Channel: %s\r\n"
 				      "State: %s\r\n"
-				      "CallerID: %s\r\n"
+				      "CallerIDNum: %s\r\n"
 				      "CallerIDName: %s\r\n"
 				      "Uniqueid: %s\r\n",
 				      c->name, ast_state2str(c->_state),
@@ -3441,7 +3441,7 @@
 		ast_cdr_setcid(chan->cdr, chan);
 	manager_event(EVENT_FLAG_CALL, "Newcallerid",
 				"Channel: %s\r\n"
-				"CallerID: %s\r\n"
+				"CallerIDNum: %s\r\n"
 				"CallerIDName: %s\r\n"
 				"Uniqueid: %s\r\n"
 				"CID-CallingPres: %d (%s)\r\n",
@@ -3467,7 +3467,7 @@
 		      (oldstate == AST_STATE_DOWN) ? "Newchannel" : "Newstate",
 		      "Channel: %s\r\n"
 		      "State: %s\r\n"
-		      "CallerID: %s\r\n"
+		      "CallerIDNum: %s\r\n"
 		      "CallerIDName: %s\r\n"
 		      "Uniqueid: %s\r\n",
 		      chan->name, ast_state2str(chan->_state),
Index: res/res_features.c
===================================================================
--- res/res_features.c	(revision 43183)
+++ res/res_features.c	(working copy)
@@ -399,7 +399,7 @@
 		"Channel: %s\r\n"
 		"From: %s\r\n"
 		"Timeout: %ld\r\n"
-		"CallerID: %s\r\n"
+		"CallerIDNum: %s\r\n"
 		"CallerIDName: %s\r\n",
 		pu->parkingexten, pu->chan->name, peer ? peer->name : "",
 		(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
@@ -1512,7 +1512,7 @@
 	manager_event(EVENT_FLAG_CALL, s,
 		"Exten: %s\r\n"
 		"Channel: %s\r\n"
-		"CallerID: %s\r\n"
+		"CallerIDNum: %s\r\n"
 		"CallerIDName: %s\r\n\r\n",
 		parkingexten, 
 		chan->name,
@@ -1766,7 +1766,7 @@
 			"Exten: %s\r\n"
 			"Channel: %s\r\n"
 			"From: %s\r\n"
-			"CallerID: %s\r\n"
+			"CallerIDNum: %s\r\n"
 			"CallerIDName: %s\r\n",
 			pu->parkingexten, pu->chan->name, chan->name,
 			S_OR(pu->chan->cid.cid_num, "<unknown>"),
@@ -1945,7 +1945,7 @@
 			"Channel: %s\r\n"
 			"From: %s\r\n"
 			"Timeout: %ld\r\n"
-			"CallerID: %s\r\n"
+			"CallerIDNum: %s\r\n"
 			"CallerIDName: %s\r\n"
 			"%s"
 			"\r\n",