diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 5bc46348e27..c46ac47cb3a 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -27,7 +27,7 @@
 /**
  * Included libs
  */
-App::import('Core', array('ClassRegistry', 'Overloadable', 'Validation', 'Behavior', 'ConnectionManager', 'Set', 'String'));
+App::import('Core', array('ClassRegistry', 'Overloadable', 'Validation', 'ModelBehavior', 'ConnectionManager', 'Set', 'String'));
 /**
  * Object-relational mapper.
  *
diff --git a/cake/libs/model/behavior.php b/cake/libs/model/model_behavior.php
similarity index 100%
rename from cake/libs/model/behavior.php
rename to cake/libs/model/model_behavior.php
diff --git a/cake/tests/cases/libs/model/behavior.test.php b/cake/tests/cases/libs/model/model_behavior.test.php
similarity index 100%
rename from cake/tests/cases/libs/model/behavior.test.php
rename to cake/tests/cases/libs/model/model_behavior.test.php