Index: /freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php
===================================================================
--- /freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php (revision 3808)
+++ /freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php (revision 3826)
@@ -191,5 +191,5 @@
 					// Start inbound processing. Unneeded line to be possibly overridden by something in 
 					// extensions_custom.conf
-					$ext->add($context, $exten, '', new ext_setvar('FROM_DID',$exten));
+					$ext->add($context, $exten, '', new ext_setvar('__FROM_DID',$exten));
 
 					// If we require RINGING, signal it as soon as we enter.
@@ -265,5 +265,5 @@
 					$ext->add('ext-did', 's', '', new ext_playback('ss-noservice'));
 					$ext->add('ext-did', 's', '', new ext_sayalpha('${FROM_DID}'));
-					$ext->add('ext-did', '_[*#X].', '', new ext_setvar('FROM_DID', '${EXTEN}'));
+					$ext->add('ext-did', '_[*#X].', '', new ext_setvar('__FROM_DID', '${EXTEN}'));
 					$ext->add('ext-did', '_[*#X].', '', new ext_noop('Received an unknown call with DID set to ${EXTEN}'));
 					$ext->add('ext-did', '_[*#X].', '', new ext_goto('1','s','ext-did'));
@@ -298,5 +298,5 @@
 				foreach($directdidlist as $item) {
 					$exten = $item['directdid'];
-					$ext->add($context, $exten, '', new ext_setvar('FROM_DID',$exten));
+					$ext->add($context, $exten, '', new ext_setvar('__FROM_DID',$exten));