diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php b/core/modules/editor/lib/Drupal/editor/Tests/QuickeditIntegrationTest.php
similarity index 96%
rename from core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php
rename to core/modules/editor/lib/Drupal/editor/Tests/QuickeditIntegrationTest.php
index f2f9350..080b507 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/QuickeditIntegrationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\editor\Tests\EditorIntegrationTest.
+ * Contains \Drupal\editor\Tests\QuickeditIntegrationTest.
  */
 
 namespace Drupal\editor\Tests;
@@ -11,15 +11,15 @@
 use Drupal\quickedit\EditorSelector;
 use Drupal\quickedit\MetadataGenerator;
 use Drupal\quickedit\Plugin\InPlaceEditorManager;
-use Drupal\quickedit\Tests\EditTestBase;
+use Drupal\quickedit\Tests\QuickeditTestBase;
 use Drupal\edit_test\MockEditEntityFieldAccessCheck;
 use Drupal\editor\EditorController;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Tests Edit module integration (Editor module's inline editing support).
+ * Tests Quick Edit module integration (Editor module's inline editing support).
  */
-class EditIntegrationTest extends EditTestBase {
+class QuickeditIntegrationTest extends QuickeditTestBase {
 
   /**
    * The manager for editor plug-ins.
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Form/EditFieldForm.php b/core/modules/quickedit/lib/Drupal/quickedit/Form/QuickeditFieldForm.php
similarity index 98%
rename from core/modules/quickedit/lib/Drupal/quickedit/Form/EditFieldForm.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Form/QuickeditFieldForm.php
index 01094bb..2c68568 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Form/EditFieldForm.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Form/QuickeditFieldForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\quickedit\Form\EditFieldForm.
+ * Contains \Drupal\quickedit\Form\QuickeditFieldForm.
  */
 
 namespace Drupal\quickedit\Form;
@@ -14,7 +14,7 @@
 /**
  * Builds and process a form for editing a single entity field.
  */
-class EditFieldForm {
+class QuickeditFieldForm {
 
   /**
    * Stores the tempstore factory.
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
index f7b399c..0e208ca 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
@@ -13,7 +13,7 @@
 /**
  * Test in-place field editor selection.
  */
-class EditorSelectionTest extends EditTestBase {
+class EditorSelectionTest extends QuickeditTestBase {
 
   /**
    * The manager for editor plugins.
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php
index eaef9b7..376510c 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php
@@ -16,7 +16,7 @@
 /**
  * Test in-place field editing metadata.
  */
-class MetadataGeneratorTest extends EditTestBase {
+class MetadataGeneratorTest extends QuickeditTestBase {
 
   /**
    * The manager for editor plugins.
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditLoadingTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickeditLoadingTest.php
similarity index 99%
rename from core/modules/quickedit/lib/Drupal/quickedit/Tests/EditLoadingTest.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickeditLoadingTest.php
index 46c1821..91750ee 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditLoadingTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickeditLoadingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\quickedit\Tests\EditLoadingTest.
+ * Contains \Drupal\quickedit\Tests\QuickeditLoadingTest.
  */
 
 namespace Drupal\quickedit\Tests;
@@ -15,7 +15,7 @@
 /**
  * Tests loading of Quick Edit and lazy-loading of in-place editors.
  */
-class EditLoadingTest extends WebTestBase {
+class QuickeditLoadingTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditTestBase.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickeditTestBase.php
similarity index 95%
rename from core/modules/quickedit/lib/Drupal/quickedit/Tests/EditTestBase.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickeditTestBase.php
index 01d47f0..6d51cf9 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditTestBase.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickeditTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\quickedit\Tests\EditTestBase.
+ * Contains \Drupal\quickedit\Tests\QuickeditTestBase.
  */
 
 namespace Drupal\quickedit\Tests;
@@ -12,7 +12,7 @@
 /**
  * Parent class for Quick Edit tests.
  */
-class EditTestBase extends DrupalUnitTestBase {
+class QuickeditTestBase extends DrupalUnitTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/quickedit/quickedit.module b/core/modules/quickedit/quickedit.module
index d287dba..ff15c6a 100644
--- a/core/modules/quickedit/quickedit.module
+++ b/core/modules/quickedit/quickedit.module
@@ -12,7 +12,7 @@
  */
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\quickedit\Form\EditFieldForm;
+use Drupal\quickedit\Form\QuickeditFieldForm;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
 use Drupal\user\TempStoreFactory;
@@ -180,6 +180,6 @@ function quickedit_entity_view_alter(&$build, EntityInterface $entity, EntityDis
  * @ingroup forms
  */
 function quickedit_field_form(array $form, array &$form_state, EntityInterface $entity, $field_name, TempStoreFactory $temp_store_factory) {
-  $form_handler = new EditFieldForm();
+  $form_handler = new QuickeditFieldForm();
   return $form_handler->build($form, $form_state, $entity, $field_name, $temp_store_factory);
 }