diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/D6Variable.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Variable.php
similarity index 87%
rename from core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/D6Variable.php
rename to core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Variable.php
index 0c66396..7f1f0b6 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/D6Variable.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Variable.php
@@ -5,17 +5,16 @@
  * Contains \Drupal\migrate\Plugin\migrate\source\d6\Variable.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source;
+namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate_drupal\Plugin\migrate\source\d6\Drupal6SqlBase;
 
 /**
  * Drupal 6 variable source from database.
  *
  * @PluginID("drupal6_variable")
  */
-class D6Variable extends Drupal6SqlBase {
+class Variable extends Drupal6SqlBase {
 
   /**
    * The variable names to fetch.
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/D6VariableTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/D6VariableTest.php
index ecc0977..7853b12 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/D6VariableTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/D6VariableTest.php
@@ -15,7 +15,7 @@
  */
 class D6VariableTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\D6Variable';
+  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Variable';
 
   protected $migrationConfiguration = array(
     'id' => 'test',
@@ -61,13 +61,13 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source;
+namespace Drupal\migrate_drupal\Tests\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate_drupal\Plugin\migrate\source\D6Variable;
+use Drupal\migrate_drupal\Plugin\migrate\source\d6\Variable;
 
-class TestD6Variable extends D6Variable {
+class TestVariable extends Variable {
   function setDatabase(Connection $database) {
     $this->database = $database;
   }