diff --git a/core/lib/Drupal/Core/Entity/EntityRevisionLogTrait.php b/core/lib/Drupal/Core/Entity/EntityRevisionLogTrait.php
deleted file mode 100644
index 09ae712..0000000
--- a/core/lib/Drupal/Core/Entity/EntityRevisionLogTrait.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Entity\EntityRevisionLogTrait.
- */
-
-namespace Drupal\Core\Entity;
-
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\user\UserInterface;
-
-/**
- * Provides a trait implementing \Drupal\Core\Entity\EntityRevisionLogInterface.
- */
-trait EntityRevisionLogTrait {
-
-}
diff --git a/core/lib/Drupal/Core/Entity/EntityRevisionLogInterface.php b/core/lib/Drupal/Core/Entity/RevisionLogInterface.php
similarity index 93%
rename from core/lib/Drupal/Core/Entity/EntityRevisionLogInterface.php
rename to core/lib/Drupal/Core/Entity/RevisionLogInterface.php
index 8793ee9..96a3e3f 100644
--- a/core/lib/Drupal/Core/Entity/EntityRevisionLogInterface.php
+++ b/core/lib/Drupal/Core/Entity/RevisionLogInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\EntityRevisionLogInterface.
+ * Contains \Drupal\Core\Entity\RevisionLogInterface.
  */
 
 namespace Drupal\Core\Entity;
@@ -11,7 +11,7 @@
 /**
  * Defines an entity type with create time/author/log information for revisions.
  */
-interface EntityRevisionLogInterface extends RevisionableInterface {
+interface RevisionLogInterface extends RevisionableInterface {
 
   /**
    * Gets the entity revision creation timestamp.
diff --git a/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php b/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php
index 34b6955..e25f8d1 100644
--- a/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php
@@ -15,7 +15,7 @@
  *
  * @ingroup entity_api
  */
-abstract class RevisionableContentEntityBase extends ContentEntityBase implements EntityRevisionLogInterface {
+abstract class RevisionableContentEntityBase extends ContentEntityBase implements RevisionLogInterface {
 
   /**
    * {@inheritdoc}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php b/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
index 07dfacf..b40f412 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\KernelTests\Core\Entity;
 
 use Drupal\entity_test\Entity\EntityTestWithRevisionLog;
-use Drupal\Tests\token\Kernel\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\user\Entity\User;
 
 /**