--- channels/chan_zap.c.orig	2008-06-04 15:35:47.000000000 -0300
+++ channels/chan_zap.c	2008-07-08 14:48:10.000000000 -0300
@@ -5215,16 +5215,16 @@
 		else
 #endif
 		if (i->channel == CHAN_PSEUDO)
-			b2 = ast_safe_string_alloc("pseudo-%ld", ast_random());
+			b2 = ast_safe_string_alloc("Zap/pseudo-%ld", ast_random());
 		else	
-			b2 = ast_safe_string_alloc("%d-%d", i->channel, y);
+			b2 = ast_safe_string_alloc("Zap/%d-%d", i->channel, y);
 		for (x = 0; x < 3; x++) {
 			if ((index != x) && i->subs[x].owner && !strcasecmp(b2, i->subs[x].owner->name))
 				break;
 		}
 		y++;
 	} while (x < 3);
-	tmp = ast_channel_alloc(0, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, "Zap/%s", b2);
+	tmp = ast_channel_alloc(0, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, b2);
 	if (b2) /*!> b2 can be freed now, it's been copied into the channel structure */
 		free(b2);
 	if (!tmp)