diff -u b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php
--- b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php
@@ -11,7 +11,8 @@
 /**
  * Defines an interface for image toolkits.
  *
- * Classes implementing this interface allow...
+ * An image toolkit provides common image file manipulations like scaling,
+ * cropping, and rotating.
  */
 interface ImageToolkitInterface {
 
diff -u b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php
--- b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Plugin\ToolkitManager.
+ * Definition of Drupal\system\Plugin\ImageToolkitManager.
  */
 
 namespace Drupal\system\Plugin;
diff -u b/core/modules/system/lib/Drupal/system/Plugin/system/imagetoolkit/GDToolkit.php b/core/modules/system/lib/Drupal/system/Plugin/system/imagetoolkit/GDToolkit.php
--- b/core/modules/system/lib/Drupal/system/Plugin/system/imagetoolkit/GDToolkit.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/system/imagetoolkit/GDToolkit.php
@@ -24,7 +24,7 @@
 class GDToolkit implements ImageToolkitInterface {
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::settingsForm().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::settingsForm().
    */
   function settingsForm() {
     if ($this->checkAvailable()) {
@@ -50,7 +50,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::settingsFormSubmit().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::settingsFormSubmit().
    */
   function settingsFormSubmit($form, &$form_state) {
     config('system.image.gd')
@@ -59,7 +59,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::resize().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::resize().
    */
   function resize(stdClass $image, $width, $height) {
     $res = $this->createTmp($image, $width, $height);
@@ -77,7 +77,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::rotate().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::rotate().
    */
   function rotate(stdClass $image, $degrees, $background = NULL) {
     // PHP installations using non-bundled GD do not have imagerotate.
@@ -131,7 +131,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::crop().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::crop().
    */
   function crop(stdClass $image, $x, $y, $width, $height) {
     $res = $this->createTmp($image, $width, $height);
@@ -149,7 +149,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::desaturate().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::desaturate().
    */
   function desaturate(stdClass $image) {
     // PHP installations using non-bundled GD do not have imagefilter.
@@ -162,7 +162,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::load().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::load().
    */
   function load(stdClass $image) {
     $extension = str_replace('jpg', 'jpeg', $image->info['extension']);
@@ -183,7 +183,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::save().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::save().
    */
   function save(stdClass $image, $destination) {
     $scheme = file_uri_scheme($destination);
@@ -223,7 +223,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::getInfo().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::getInfo().
    */
   function getInfo(stdClass $image) {
     $details = FALSE;
@@ -287,7 +287,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::checkAvailable().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::checkAvailable().
    */
   public static function checkAvailable() {
     if ($check = get_extension_funcs('gd')) {
@@ -300,9 +300,2 @@
   }
-
-  /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::getDescription().
-   */
-  public static function getDescription() {
-    return t('GD2 image manipulation toolkit');
-  }
 }
diff -u b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/system/imagetoolkit/BrokenToolkit.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/system/imagetoolkit/BrokenToolkit.php
--- b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/system/imagetoolkit/BrokenToolkit.php
+++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/system/imagetoolkit/BrokenToolkit.php
@@ -20,7 +20,7 @@
  */
 class BrokenToolkit extends TestToolkit {
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::checkAvailable().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::checkAvailable().
    */
   static function checkAvailable() {
     return FALSE;
diff -u b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/system/imagetoolkit/TestToolkit.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/system/imagetoolkit/TestToolkit.php
--- b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/system/imagetoolkit/TestToolkit.php
+++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/system/imagetoolkit/TestToolkit.php
@@ -23,7 +23,7 @@
 class TestToolkit implements ImageToolkitInterface {
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::settingsForm().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::settingsForm().
    */
   function settingsForm() {
     $this->_logCall('settings', array());
@@ -31,12 +31,12 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::settingsFormSubmit().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::settingsFormSubmit().
    */
   function settingsFormSubmit($form, &$form_state) {}
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::getInfo().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::getInfo().
    */
   function getInfo(stdClass $image) {
     $this->_logCall('get_info', array($image));
@@ -44,7 +44,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::load().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::load().
    */
   function load(stdClass $image) {
     $this->_logCall('load', array($image));
@@ -52,7 +52,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::save().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::save().
    */
   function save(stdClass $image, $destination) {
     $this->_logCall('save', array($image, $destination));
@@ -62,7 +62,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::crop().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::crop().
    */
   function crop(stdClass $image, $x, $y, $width, $height) {
     $this->_logCall('crop', array($image, $x, $y, $width, $height));
@@ -70,7 +70,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::resize().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::resize().
    */
   function resize(stdClass $image, $width, $height) {
     $this->_logCall('resize', array($image, $width, $height));
@@ -78,7 +78,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::rotate().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::rotate().
    */
   function rotate(stdClass $image, $degrees, $background = NULL) {
     $this->_logCall('rotate', array($image, $degrees, $background));
@@ -86,7 +86,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::desaturate().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::desaturate().
    */
   function desaturate(stdClass $image) {
     $this->_logCall('desaturate', array($image));
@@ -112,7 +112,7 @@
   }
 
   /**
-   * Implements Drupal\Core\Image\Plugin\ToolkitInterface::checkAvailable().
+   * Implements Drupal\system\Plugin\ImageToolkitInterface::checkAvailable().
    */
   static function checkAvailable() {
     return TRUE;