diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
index 8ea0251b..d8b28e09 100644
--- a/code/Controllers/CMSMain.php
+++ b/code/Controllers/CMSMain.php
@@ -636,7 +636,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
             }
 
             $singularName = $instance->i18n_singular_name();
-            $description = $instance->i18n_description();
+            $description = $instance->i18n_classDescription();
 
             $result->push(new ArrayData(array(
                 'ClassName' => $class,
diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
index 79a640ff..4e300df8 100755
--- a/code/Model/SiteTree.php
+++ b/code/Model/SiteTree.php
@@ -321,8 +321,8 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
      * Description of the class functionality, typically shown to a user
      * when selecting which page type to create. Translated through {@link provideI18nEntities()}.
      *
-     * @see SiteTree::description()
-     * @see SiteTree::i18n_description()
+     * @see SiteTree::classDescription()
+     * @see SiteTree::i18n_classDescription()
      *
      * @config
      * @var string
@@ -333,8 +333,8 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
      * Description for Page and SiteTree classes, but not inherited by subclasses.
      * override SiteTree::$description in subclasses instead.
      *
-     * @see SiteTree::description()
-     * @see SiteTree::i18n_description()
+     * @see SiteTree::classDescription()
+     * @see SiteTree::i18n_classDescription()
      *
      * @config
      * @var string
@@ -3085,11 +3085,11 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
     }
 
     /**
-     * Get description for this page
+     * Get description for this page type
      *
      * @return string|null
      */
-    public function description()
+    public function classDescription()
     {
         $base = in_array(static::class, [Page::class, self::class]);
         if ($base) {
@@ -3103,9 +3103,9 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
      *
      * @return string|null
      */
-    public function i18n_description()
+    public function i18n_classDescription()
     {
-        $description = $this->description();
+        $description = $this->classDescription();
         if ($description) {
             return _t(static::class.'.DESCRIPTION', $description);
         }
@@ -3123,7 +3123,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
         $entities = parent::provideI18nEntities();
 
         // Add optional description
-        $description = $this->description();
+        $description = $this->classDescription();
         if ($description) {
             $entities[static::class . '.DESCRIPTION'] = $description;
         }