Index: pbx/pbx_ael.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_ael.c,v
retrieving revision 1.6
diff -u -r1.6 pbx_ael.c
--- pbx/pbx_ael.c	15 Jul 2005 16:32:44 -0000	1.6
+++ pbx/pbx_ael.c	1 Aug 2005 23:07:41 -0000
@@ -631,8 +631,8 @@
 			if (ast_add_extension2(con, 0, exten, ifend, *label, NULL, app, strdup(margs), FREE, registrar))
 				ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 			*label = NULL;
-			app = "Goto";
-			snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", args, ifstart, elsestart);
+			app = "GotoIf";
+			snprintf(margs, mlen, "$[ %s ]?%d:%d", args, ifstart, elsestart);
 			if (ast_add_extension2(con, 0, exten, ifblock, iflabel, NULL, app, strdup(margs), FREE, registrar))
 				ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 			if (ifskip) {
@@ -683,8 +683,8 @@
 			if (ast_add_extension2(con, 0, exten, (*pos)++, *label, NULL, app, strdup(margs), FREE, registrar))
 				ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 			*label = NULL;
-			app = "Goto";
-			snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", args, whileblock, whileend);
+			app = "GotoIf";
+			snprintf(margs, mlen, "$[ %s ]?%d:%d", args, whileblock, whileend);
 			if (ast_add_extension2(con, 0, exten, whilestart, whilelabel, NULL, app, strdup(margs), FREE, registrar))
 				ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 			fillin_process(con, fillin, filename, lineno, exten, whileend, exten, whilestart);
@@ -786,8 +786,8 @@
 				if (ast_add_extension2(con, 0, exten, (*pos)++, *label, NULL, app, strdup(margs), FREE, registrar))
 					ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 				*label = NULL;
-				app = "Goto";
-				snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", fields->next->data, forblock, forend);
+				app = "GotoIf";
+				snprintf(margs, mlen, "$[ %s ]?%d:%d", fields->next->data, forblock, forend);
 				if (ast_add_extension2(con, 0, exten, forstart, forlabel, NULL, app, strdup(margs), FREE, registrar))
 					ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", forstart, what, name);
 				fillin_process(con, fillin, filename, lineno, exten, forend, exten, forstart);