diff --git a/Form/PropelTypeGuesser.php b/Form/TypeGuesser.php
similarity index 99%
rename from Form/PropelTypeGuesser.php
rename to Form/TypeGuesser.php
index 14f6702..465a7c1 100644
--- a/Form/PropelTypeGuesser.php
+++ b/Form/TypeGuesser.php
@@ -23,7 +23,7 @@ use Symfony\Component\Form\Guess\ValueGuess;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class PropelTypeGuesser implements FormTypeGuesserInterface
+class TypeGuesser implements FormTypeGuesserInterface
 {
     private $cache = array();
 
diff --git a/Resources/config/propel.xml b/Resources/config/propel.xml
index 361825a..cca8b34 100644
--- a/Resources/config/propel.xml
+++ b/Resources/config/propel.xml
@@ -12,7 +12,7 @@
         <parameter key="propel.data_collector.class">Propel\PropelBundle\DataCollector\PropelDataCollector</parameter>
         <parameter key="propel.logger.class">Propel\PropelBundle\Logger\PropelLogger</parameter>
         <parameter key="propel.twig.extension.syntax.class">Propel\PropelBundle\Twig\Extension\SyntaxExtension</parameter>
-        <parameter key="form.type_guesser.propel.class">Propel\PropelBundle\Form\PropelTypeGuesser</parameter>
+        <parameter key="form.type_guesser.propel.class">Propel\PropelBundle\Form\TypeGuesser</parameter>
     </parameters>
 
     <services>
diff --git a/Tests/Form/PropelTypeGuesserTest.php b/Tests/Form/TypeGuesserTest.php
similarity index 96%
rename from Tests/Form/PropelTypeGuesserTest.php
rename to Tests/Form/TypeGuesserTest.php
index a5c9137..2367184 100644
--- a/Tests/Form/PropelTypeGuesserTest.php
+++ b/Tests/Form/TypeGuesserTest.php
@@ -11,11 +11,11 @@
 
 namespace Propel\PropelBundle\Tests\Form;
 
-use Propel\PropelBundle\Form\PropelTypeGuesser;
+use Propel\PropelBundle\Form\TypeGuesser;
 use Propel\PropelBundle\Tests\TestCase;
 use Symfony\Component\Form\Guess\Guess;
 
-class PropelTypeGuesserTest extends TestCase
+class TypeGuesserTest extends TestCase
 {
     const CLASS_NAME = 'Propel\PropelBundle\Tests\Fixtures\Item';
 
@@ -25,7 +25,7 @@ class PropelTypeGuesserTest extends TestCase
 
     public function setUp()
     {
-        $this->guesser = new PropelTypeGuesser();
+        $this->guesser = new TypeGuesser();
     }
 
     public function testGuessMaxLengthWithText()