diff --git a/code/forms/JsonField.php b/code/forms/DMSJsonField.php
similarity index 96%
rename from code/forms/JsonField.php
rename to code/forms/DMSJsonField.php
index f1269f4..31de0a9 100644
--- a/code/forms/JsonField.php
+++ b/code/forms/DMSJsonField.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * Class JsonField combines form inputs into a key-value pair
+ * Combines form inputs into a key-value pair
  */
-class JsonField extends CompositeField
+class DMSJsonField extends CompositeField
 {
     public function __construct($name, $children = null)
     {
@@ -90,7 +90,7 @@ class JsonField extends CompositeField
     }
 
     /**
-     * Sets
+     * Sets the value
      * @param mixed $value
      *
      * @return $this
diff --git a/code/model/DMSDocumentSet.php b/code/model/DMSDocumentSet.php
index 586eed3..005524f 100644
--- a/code/model/DMSDocumentSet.php
+++ b/code/model/DMSDocumentSet.php
@@ -212,7 +212,7 @@ class DMSDocumentSet extends DataObject
                 $field->setMultiple(true)->setSource($map);
             }
         }
-        $keyValPairs = JsonField::create('KeyValuePairs', $dmsDocFields->toArray());
+        $keyValPairs = DMSJsonField::create('KeyValuePairs', $dmsDocFields->toArray());
 
         // Now lastly add the sort fields
         $sortedBy = FieldGroup::create('SortedBy', array(
diff --git a/tests/JsonFieldTest.php b/tests/forms/DMSJsonFieldTest.php
similarity index 82%
rename from tests/JsonFieldTest.php
rename to tests/forms/DMSJsonFieldTest.php
index 5fbf0ec..46d5099 100644
--- a/tests/JsonFieldTest.php
+++ b/tests/forms/DMSJsonFieldTest.php
@@ -1,22 +1,22 @@
 <?php
 
-class JsonFieldTest extends SapphireTest
+class DMSJsonFieldTest extends SapphireTest
 {
     public function testJsonFieldConstructorMultiWays()
     {
-        $jsonField = new JsonField('MyJsonField', new FieldList(
+        $jsonField = new DMSJsonField('MyJsonField', new FieldList(
             new TextField('FirstName', 'Given name'),
             new TextField('Surname', 'Last name')
         ));
         $this->assertEquals($jsonField->FieldList()->count(), 2);
         $this->assertNotNull($jsonField->FieldList()->dataFieldByName('MyJsonField[FirstName]'));
 
-        $jsonField = new JsonField('MyJsonField', array(new TextField('FirstName', 'Given name'),
+        $jsonField = new DMSJsonField('MyJsonField', array(new TextField('FirstName', 'Given name'),
             new TextField('Surname', 'Last name')));
         $this->assertEquals($jsonField->FieldList()->count(), 2);
         $this->assertNotNull($jsonField->FieldList()->dataFieldByName('MyJsonField[FirstName]'));
 
-        $jsonField = new JsonField(
+        $jsonField = new DMSJsonField(
             'MyJsonField',
             new TextField('FirstName', 'Given name'),
             new TextField('Surname', 'Last name')
@@ -27,7 +27,7 @@ class JsonFieldTest extends SapphireTest
 
     public function testJsonFieldDataValueCouldDealWithArray()
     {
-        $jsonField = new JsonField('MyJsonField', new FieldList(
+        $jsonField = new DMSJsonField('MyJsonField', new FieldList(
             new TextField('FirstName', 'Given name'),
             new TextField('Surname', 'Last name')
         ));