diff --git a/composer.json b/composer.json
index ccf216c9a7e..173bdd36cee 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "doctrine/orm",
+    "name": "emagister/doctrine-orm",
     "type": "library",
     "description": "Object-Relational-Mapper for PHP",
-    "keywords": ["orm", "database"],
+    "keywords": ["emagister", "orm", "database"],
     "homepage": "http://www.doctrine-project.org",
     "license": "MIT",
     "authors": [
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 9e036b652d6..bf83caa3643 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1435,10 +1435,6 @@ protected function _validateAndCompleteFieldMapping(array &$mapping)
         }
 
         if (Type::hasType($mapping['type']) && Type::getType($mapping['type'])->canRequireSQLConversion()) {
-            if (isset($mapping['id']) && $mapping['id'] === true) {
-                 throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName'], $mapping['type']);
-            }
-
             $mapping['requireSQLConversion'] = true;
         }
     }