diff --git a/cake/console/libs/templates/skel/config/acl.ini.php b/cake/console/libs/templates/skel/config/acl.ini.php
index a9868e685e9..ee585c27a94 100644
--- a/cake/console/libs/templates/skel/config/acl.ini.php
+++ b/cake/console/libs/templates/skel/config/acl.ini.php
@@ -1,4 +1,4 @@
-;<?php die() ?>
+;<?php exit() ?>
 ; SVN FILE: $Id$
 ;/**
 ; * Short description for file.
diff --git a/cake/console/libs/templates/skel/webroot/css.php b/cake/console/libs/templates/skel/webroot/css.php
index 52b57fee7a8..8c5e9ab0afc 100644
--- a/cake/console/libs/templates/skel/webroot/css.php
+++ b/cake/console/libs/templates/skel/webroot/css.php
@@ -66,7 +66,7 @@ function write_css_cache($path, $content) {
 	}
 
 	if (preg_match('|\.\.|', $url) || !preg_match('|^ccss/(.+)$|i', $url, $regs)) {
-		die('Wrong file name.');
+		exit('Wrong file name.');
 	}
 
 	$filename = 'css/' . $regs[1];
@@ -74,7 +74,7 @@ function write_css_cache($path, $content) {
 	$cachepath = CACHE . 'css' . DS . str_replace(array('/','\\'), '-', $regs[1]);
 
 	if (!file_exists($filepath)) {
-		die('Wrong file name.');
+		exit('Wrong file name.');
 	}
 
 	if (file_exists($cachepath)) {
diff --git a/cake/console/libs/templates/skel/webroot/test.php b/cake/console/libs/templates/skel/webroot/test.php
index a57d15747e5..1d668947be9 100644
--- a/cake/console/libs/templates/skel/webroot/test.php
+++ b/cake/console/libs/templates/skel/webroot/test.php
@@ -95,7 +95,7 @@
 require_once CAKE_TESTS_LIB . 'test_manager.php';
 
 if (Configure::read('debug') < 1) {
-	die(__('Debug setting does not allow access to this url.', true));
+	exit(__('Debug setting does not allow access to this url.', true));
 }
 
 if (!isset($_SERVER['SERVER_NAME'])) {
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index a49b39abb26..b5693da97d2 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -218,7 +218,7 @@ function handleError($code, $description, $file = null, $line = null, $context =
 		}
 
 		if ($error == 'Fatal Error') {
-			die();
+			exit();
 		}
 		return true;
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index e68948668c9..c6af41d25c7 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -95,7 +95,7 @@ function connect() {
 			$connect = 'odbc_connect';
 		}
 		if (!function_exists($connect)) {
-			die('no odbc?');
+			exit('no odbc?');
 		}
 		$this->connected = false;
 		$this->connection = $connect($config['database'], $config['login'], $config['password'],  SQL_CUR_USE_ODBC);
diff --git a/cake/tests/test_app/config/acl.ini.php b/cake/tests/test_app/config/acl.ini.php
index 351f02c9968..9ac2b5d60d8 100644
--- a/cake/tests/test_app/config/acl.ini.php
+++ b/cake/tests/test_app/config/acl.ini.php
@@ -1,4 +1,4 @@
-;<?php die() ?>
+;<?php exit() ?>
 ; SVN FILE: $Id$
 ;/**
 ; * Test App Ini Based Acl Config File