diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index 1e3d0faca..f25c55b82 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -1567,9 +1567,14 @@ final class ClassMetadata
     public function setDiscriminatorColumn($columnDef)
     {
         $this->discriminatorColumn = $columnDef;
+        
         if ( ! isset($columnDef['fieldName'])) {
             $this->discriminatorColumn['fieldName'] = $columnDef['name'];
         }
+        
+        if ( ! isset($columnDef['name'])) {
+            $this->discriminatorColumn['name'] = $this->discriminatorColumn['fieldName'];
+        }
     }
 
     /**