diff --git a/Doctrine/Validator/Date.class.php b/Doctrine/Validator/Date.php
similarity index 100%
rename from Doctrine/Validator/Date.class.php
rename to Doctrine/Validator/Date.php
diff --git a/Doctrine/Validator/Email.class.php b/Doctrine/Validator/Email.php
similarity index 100%
rename from Doctrine/Validator/Email.class.php
rename to Doctrine/Validator/Email.php
diff --git a/Doctrine/Validator/Enum.class.php b/Doctrine/Validator/Enum.php
similarity index 100%
rename from Doctrine/Validator/Enum.class.php
rename to Doctrine/Validator/Enum.php
diff --git a/Doctrine/Validator/Exception.php b/Doctrine/Validator/Exception.php
index 8e8232ef8..61a4f842b 100644
--- a/Doctrine/Validator/Exception.php
+++ b/Doctrine/Validator/Exception.php
@@ -1,5 +1,5 @@
 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 
 class Doctrine_Validator_Exception extends Doctrine_Exception {
     private $validator;