diff --git a/src/Type/Definition/Argument.php b/src/Type/Definition/Argument.php
index 36ce33ec..7b027866 100644
--- a/src/Type/Definition/Argument.php
+++ b/src/Type/Definition/Argument.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\DefaultValueTrait;
diff --git a/src/Behavior/DescriptionTrait.php b/src/Type/Definition/Behavior/DescriptionTrait.php
similarity index 90%
rename from src/Behavior/DescriptionTrait.php
rename to src/Type/Definition/Behavior/DescriptionTrait.php
index cb7f78b9..4f843ea6 100644
--- a/src/Behavior/DescriptionTrait.php
+++ b/src/Type/Definition/Behavior/DescriptionTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Digia\GraphQL\Behavior;
+namespace Digia\GraphQL\Type\Definition\Behavior;
 
 trait DescriptionTrait
 {
diff --git a/src/Type/Definition/EnumType.php b/src/Type/Definition/EnumType.php
index fc0846f2..a89a8d75 100644
--- a/src/Type/Definition/EnumType.php
+++ b/src/Type/Definition/EnumType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeInterface;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\KindEnum;
diff --git a/src/Type/Definition/EnumValue.php b/src/Type/Definition/EnumValue.php
index f5e8590e..49b45e29 100644
--- a/src/Type/Definition/EnumValue.php
+++ b/src/Type/Definition/EnumValue.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Behavior\ValueTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\EnumValueDefinitionNode;
diff --git a/src/Type/Definition/Field.php b/src/Type/Definition/Field.php
index 98f33c3f..869be538 100644
--- a/src/Type/Definition/Field.php
+++ b/src/Type/Definition/Field.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Type\Definition\Behavior\ArgumentsTrait;
 use Digia\GraphQL\Type\Definition\Behavior\DeprecationTrait;
diff --git a/src/Type/Definition/InputField.php b/src/Type/Definition/InputField.php
index 9c2a28aa..7af4b233 100644
--- a/src/Type/Definition/InputField.php
+++ b/src/Type/Definition/InputField.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\DefaultValueTrait;
diff --git a/src/Type/Definition/InputObjectType.php b/src/Type/Definition/InputObjectType.php
index a6342f1c..6e7dbe8d 100644
--- a/src/Type/Definition/InputObjectType.php
+++ b/src/Type/Definition/InputObjectType.php
@@ -19,7 +19,7 @@
  */
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\InputObjectTypeDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;
diff --git a/src/Type/Definition/InterfaceType.php b/src/Type/Definition/InterfaceType.php
index 053a135d..bc9bc348 100644
--- a/src/Type/Definition/InterfaceType.php
+++ b/src/Type/Definition/InterfaceType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\InterfaceTypeDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\ExtensionASTNodesTrait;
diff --git a/src/Type/Definition/ListType.php b/src/Type/Definition/ListType.php
index 135a7d63..e1239175 100644
--- a/src/Type/Definition/ListType.php
+++ b/src/Type/Definition/ListType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;
 use Digia\GraphQL\Type\Definition\Behavior\OfTypeTrait;
 use Digia\GraphQL\Type\Definition\Contract\TypeInterface;
diff --git a/src/Type/Definition/NonNullType.php b/src/Type/Definition/NonNullType.php
index 64f36bce..5eaaec2b 100644
--- a/src/Type/Definition/NonNullType.php
+++ b/src/Type/Definition/NonNullType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;
 use Digia\GraphQL\Type\Definition\Behavior\OfTypeTrait;
 use Digia\GraphQL\Type\Definition\Contract\TypeInterface;
diff --git a/src/Type/Definition/ObjectType.php b/src/Type/Definition/ObjectType.php
index 5fb4c93e..8f0e7227 100644
--- a/src/Type/Definition/ObjectType.php
+++ b/src/Type/Definition/ObjectType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\ObjectTypeDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\ExtensionASTNodesTrait;
diff --git a/src/Type/Definition/Scalar/AbstractScalarType.php b/src/Type/Definition/Scalar/AbstractScalarType.php
index 6a684ac2..ae2e2f73 100644
--- a/src/Type/Definition/Scalar/AbstractScalarType.php
+++ b/src/Type/Definition/Scalar/AbstractScalarType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition\Scalar;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeInterface;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\ScalarTypeDefinitionNode;
diff --git a/src/Type/Definition/UnionType.php b/src/Type/Definition/UnionType.php
index 3308a1ce..29821c30 100644
--- a/src/Type/Definition/UnionType.php
+++ b/src/Type/Definition/UnionType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\UnionTypeDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;
diff --git a/src/Type/Directive/AbstractDirective.php b/src/Type/Directive/AbstractDirective.php
index 2215505b..5cbc33d5 100644
--- a/src/Type/Directive/AbstractDirective.php
+++ b/src/Type/Directive/AbstractDirective.php
@@ -5,7 +5,7 @@
 use Digia\GraphQL\Type\Definition\Behavior\ArgumentsTrait;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 
 abstract class AbstractDirective implements DirectiveInterface
 {
diff --git a/tests/Unit/Type/Definition/Behavior/DescriptionTraitTest.php b/tests/Unit/Type/Definition/Behavior/DescriptionTraitTest.php
new file mode 100644
index 00000000..8e43c717
--- /dev/null
+++ b/tests/Unit/Type/Definition/Behavior/DescriptionTraitTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Digia\GraphQL\Test\Unit\Type\Definition\Behavior;
+
+use Digia\GraphQL\Test\Unit\TestCase;
+use Digia\GraphQL\Behavior\ConfigTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
+
+class DescriptionTraitTest extends TestCase
+{
+
+    /**
+     * @var DescribedClass
+     */
+    protected $instance;
+
+    public function setUp()
+    {
+        $this->instance = new DescribedClass([
+            'description' => 'Some description',
+        ]);
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testGetDescription()
+    {
+        $this->assertEquals('Some description', $this->instance->getDescription());
+    }
+}
+
+class DescribedClass {
+    use DescriptionTrait;
+    use ConfigTrait;
+}
diff --git a/tests/Unit/Type/Definition/Behavior/NameTraitTest.php b/tests/Unit/Type/Definition/Behavior/NameTraitTest.php
index 7d8227ab..26cb2508 100644
--- a/tests/Unit/Type/Definition/Behavior/NameTraitTest.php
+++ b/tests/Unit/Type/Definition/Behavior/NameTraitTest.php
@@ -24,7 +24,7 @@ public function setUp()
     /**
      * @throws \Exception
      */
-    public function testSetName()
+    public function testGetName()
     {
         $this->assertEquals('Dummy', $this->instance->getName());
     }