Index: trunk/core/kernel/utility/factory.php
===================================================================
diff -u -N -r4802 -r4880
--- trunk/core/kernel/utility/factory.php	(.../factory.php)	(revision 4802)
+++ trunk/core/kernel/utility/factory.php	(.../factory.php)	(revision 4880)
@@ -93,7 +93,7 @@
 				return $false;
 			}
 
-			if ($this->Application->isDebugMode() && dbg_ConstOn('DBG_FACTORY')) {
+			if ($this->Application->isDebugMode() && constOn('DBG_FACTORY')) {
 				global $debugger;
 				$debugger->appendHTML('<b>Creating object:</b> Pseudo class: '.$pseudo_class.' Prefix: '.$name);
 				$debugger->appendTrace();
@@ -146,7 +146,7 @@
 				return $false;
 			}
 
-			if ($this->Application->isDebugMode() && dbg_ConstOn('DBG_FACTORY')) {
+			if ($this->Application->isDebugMode() && constOn('DBG_FACTORY')) {
 				global $debugger;
 				$debugger->appendHTML('<b>Creating object:</b> Pseudo class: '.$pseudo_class.' Prefix: '.$name);
 				$debugger->appendTrace();
@@ -244,7 +244,7 @@
 				$pseudo_class = array_shift($func_args);
 				$class =& ref_call_user_func_array( Array($real_class,'makeClass'), $func_args );
 			}
-			if( defined('DEBUG_MODE') && DEBUG_MODE && dbg_ConstOn('DBG_PROFILE_MEMORY') )
+			if( defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_PROFILE_MEMORY') )
 			{
 				$mem_after = memory_get_usage();
 				$time_after = getmicrotime();