diff --git a/core/modules/book/book.services.yml b/core/modules/book/book.services.yml
index d1ae50e..f84ead9 100644
--- a/core/modules/book/book.services.yml
+++ b/core/modules/book/book.services.yml
@@ -16,7 +16,7 @@ services:
     class: Drupal\book\BookExport
     arguments: ['@entity.manager', '@book.manager']
   book.storage:
-    class: Drupal\book\BookStorage
+    class: Drupal\book\BookOutlineStorage
     arguments: ['@database']
   access_check.book.removable:
     class: Drupal\book\Access\BookNodeIsRemovableAccessCheck
diff --git a/core/modules/book/src/BookManager.php b/core/modules/book/src/BookManager.php
index 911c3e4..42ee817 100644
--- a/core/modules/book/src/BookManager.php
+++ b/core/modules/book/src/BookManager.php
@@ -52,7 +52,7 @@ class BookManager implements BookManagerInterface {
   /**
    * Book Storage.
    *
-   * @var \Drupal\book\BookStorageInterface
+   * @var \Drupal\book\BookOutlineStorageInterface
    */
   protected $bookStorage;
 
@@ -66,7 +66,7 @@ class BookManager implements BookManagerInterface {
   /**
    * Constructs a BookManager object.
    */
-  public function __construct(EntityManagerInterface $entity_manager, TranslationInterface $translation, ConfigFactoryInterface $config_factory, BookStorageInterface $book_storage) {
+  public function __construct(EntityManagerInterface $entity_manager, TranslationInterface $translation, ConfigFactoryInterface $config_factory, BookOutlineStorageInterface $book_storage) {
     $this->entityManager = $entity_manager;
     $this->stringTranslation = $translation;
     $this->configFactory = $config_factory;
diff --git a/core/modules/book/src/BookStorage.php b/core/modules/book/src/BookOutlineStorage.php
similarity index 95%
rename from core/modules/book/src/BookStorage.php
rename to core/modules/book/src/BookOutlineStorage.php
index 621932c..cfc281a 100644
--- a/core/modules/book/src/BookStorage.php
+++ b/core/modules/book/src/BookOutlineStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\book\BookStorage.
+ * Definition of Drupal\book\BookOutlineStorage.
  */
 
 namespace Drupal\book;
@@ -10,9 +10,9 @@
 use Drupal\Core\Database\Connection;
 
 /**
- * Defines a storage class for books.
+ * Defines a storage class for books outline.
  */
-class BookStorage implements BookStorageInterface {
+class BookOutlineStorage implements BookOutlineStorageInterface {
 
   /**
    * Database Service Object.
@@ -22,7 +22,7 @@ class BookStorage implements BookStorageInterface {
   protected $connection;
 
   /**
-   * Constructs a BookStorage object.
+   * Constructs a BookOutlineStorage object.
    */
   public function __construct(Connection $connection) {
     $this->connection = $connection;
diff --git a/core/modules/book/src/BookStorageInterface.php b/core/modules/book/src/BookOutlineStorageInterface.php
similarity index 95%
rename from core/modules/book/src/BookStorageInterface.php
rename to core/modules/book/src/BookOutlineStorageInterface.php
index a92dff2..8a27592 100644
--- a/core/modules/book/src/BookStorageInterface.php
+++ b/core/modules/book/src/BookOutlineStorageInterface.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\book\BookStorageInterface.
+ * Contains \Drupal\book\BookOutlineStorageInterface.
 */
 
 namespace Drupal\book;
 
 /**
- * Defines a common interface for book storage classes.
+ * Defines a common interface for book outline storage classes.
  */
-interface BookStorageInterface {
+interface BookOutlineStorageInterface {
 
   /**
    * Gets books (the highest positioned book links).
diff --git a/core/modules/book/tests/src/BookManagerTest.php b/core/modules/book/tests/src/BookManagerTest.php
index 93e7e63..44d7a54 100644
--- a/core/modules/book/tests/src/BookManagerTest.php
+++ b/core/modules/book/tests/src/BookManagerTest.php
@@ -47,7 +47,7 @@ class BookManagerTest extends UnitTestCase {
   /**
    * Book Storage.
    *
-   * @var \Drupal\book\BookStorageInterface
+   * @var \Drupal\book\BookOutlineStorageInterface
    */
   protected $bookStorage;
 
@@ -58,7 +58,7 @@ protected function setUp() {
     $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $this->translation = $this->getStringTranslationStub();
     $this->configFactory = $this->getConfigFactoryStub(array());
-    $this->bookStorage = $this->getMock('Drupal\book\BookStorageInterface');
+    $this->bookStorage = $this->getMock('Drupal\book\BookOutlineStorageInterface');
     $this->bookManager = new BookManager($this->entityManager, $this->translation, $this->configFactory, $this->bookStorage);
   }