diff --git a/code/extensions/DMSSiteTreeExtension.php b/code/extensions/DMSSiteTreeExtension.php
index a7e873e..abeb7de 100644
--- a/code/extensions/DMSSiteTreeExtension.php
+++ b/code/extensions/DMSSiteTreeExtension.php
@@ -26,7 +26,7 @@ class DMSSiteTreeExtension extends DataExtension
         }
 
         $gridField = GridField::create(
-            'Document Sets',
+            'DocumentSets',
             false,
             $this->owner->DocumentSets(), //->Sort('DocumentSort'),
             $config = new GridFieldConfig_RelationEditor
@@ -39,9 +39,17 @@ class DMSSiteTreeExtension extends DataExtension
         );
 
         $fields->addFieldToTab(
-            'Root.Document Sets (' . $this->owner->DocumentSets()->count() . ')',
+            'Root.DocumentSets',
             $gridField
         );
+
+        $fields
+            ->findOrMakeTab('Root.DocumentSets')
+            ->setTitle(_t(
+                __CLASS__ . '.DocumentSetsTabTitle',
+                'Document Sets ({count})',
+                array('count' => $this->owner->DocumentSets()->count())
+            ));
     }
 
     /**
diff --git a/lang/en.yml b/lang/en.yml
index 36be04f..6d09c12 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -32,6 +32,8 @@ en:
     SHOWONPAGE: Show on page
     SINGULARNAME: Document Set
     TAGS_RIGHT_TITLE: Tags can be set in the taxonomy area, and can be assigned when editing a document.
+  DMSSiteTreeExtension:
+    DocumentSetsTabTitle: 'Document Sets ({count})'
   DMSDocumentTaxonomyExtension:
     TAGS: Tags
     NOTAGS: No tags found
diff --git a/tests/extensions/DMSSiteTreeExtensionTest.php b/tests/extensions/DMSSiteTreeExtensionTest.php
index db7d952..9e329e8 100644
--- a/tests/extensions/DMSSiteTreeExtensionTest.php
+++ b/tests/extensions/DMSSiteTreeExtensionTest.php
@@ -22,7 +22,7 @@ class DMSSiteTreeExtensionTest extends SapphireTest
     {
         Config::inst()->update('SiteTree', 'documents_enabled', $configSetting);
         $siteTree = $this->objFromFixture('SiteTree', 's2');
-        $this->$assertionMethod($siteTree->getCMSFields()->fieldByName('Root.Document Sets (1).Document Sets'));
+        $this->$assertionMethod($siteTree->getCMSFields()->fieldByName('Root.DocumentSets.DocumentSets'));
     }
 
     /**
@@ -45,7 +45,7 @@ class DMSSiteTreeExtensionTest extends SapphireTest
     {
         Config::inst()->update('SiteTree', 'documents_enabled', true);
         $siteTree = $this->objFromFixture('SiteTree', 's2');
-        $gridField = $siteTree->getCMSFields()->fieldByName('Root.Document Sets (1).Document Sets');
+        $gridField = $siteTree->getCMSFields()->fieldByName('Root.DocumentSets.DocumentSets');
 
         $this->assertInstanceOf('GridField', $gridField);
         $this->assertTrue((bool) $gridField->hasClass('documentsets'));
@@ -90,7 +90,7 @@ class DMSSiteTreeExtensionTest extends SapphireTest
     public function testGetRelatedDocumentsForAutocompleter()
     {
         $page = $this->objFromFixture('SiteTree', 's1');
-        $gridField = $page->getCMSFields()->fieldByName('Root.Document Sets (2).Document Sets');
+        $gridField = $page->getCMSFields()->fieldByName('Root.DocumentSets.DocumentSets');
         $this->assertInstanceOf('GridField', $gridField);
 
         $autocompleter = $gridField->getConfig()->getComponentByType('GridFieldAddExistingAutocompleter');