diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlSourceTestCase.php b/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlSourceTestCase.php
index 598db2c..98db38eb 100644
--- a/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlSourceTestCase.php
+++ b/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlSourceTestCase.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\migrate\Tests;
+
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\migrate\Source;
 
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/load/LoadEntity.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/load/LoadEntity.php
index 113d473..a45baac 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/load/LoadEntity.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/load/LoadEntity.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\load\LoadEntity.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\load\LoadEntity.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\load;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/BlockSettings.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/BlockSettings.php
index a38be93..a804352 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/BlockSettings.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/BlockSettings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
  * @file
- * Contains
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\BlockSettings.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FieldIdGenerator.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FieldIdGenerator.php
index 039562b..6521e83 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FieldIdGenerator.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FieldIdGenerator.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
-use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FileUri.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FileUri.php
index 5383d56..a3a9a3b 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FileUri.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FileUri.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
-use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/DrupalSqlBase.php
index 334dbde..a3c4a17 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/DrupalSqlBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Drupal6SqlBase.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\Drupal6SqlBase.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/Variable.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/Variable.php
index 3fb75bd..e66b413 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/Variable.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/Variable.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Variable.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\Variable.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Action.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Action.php
index e0276e4..274190b 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Action.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Action.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Action.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Action.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/AggregatorFeed.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/AggregatorFeed.php
index d4cbc85..849599e 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/AggregatorFeed.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/AggregatorFeed.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\AggregatorFeed.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorFeed.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/AggregatorItem.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/AggregatorItem.php
index 4d055a9..7656560 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/AggregatorItem.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/AggregatorItem.php
@@ -2,14 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\AggregatorItem.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorItem.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
-
 /**
  * Drupal 6 aggregator item source from database.
  *
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Block.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Block.php
index 8c527df..362abdc 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Block.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Block.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
-
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Book.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Book.php
index dc95d7a..ed02351 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Book.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Book.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Box.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Box.php
index f8ad4f2..f8eec40 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Box.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Box.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Boxes.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Box.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/CckFieldRevision.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/CckFieldRevision.php
index 0ac4921..97535e3 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/CckFieldRevision.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/CckFieldRevision.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\CckFieldRevision.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\CckFieldRevision.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/CckFieldValues.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/CckFieldValues.php
index 1f241c2..ba93e18 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/CckFieldValues.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/CckFieldValues.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\CckFieldValues.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\CckFieldValues.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
@@ -90,8 +90,6 @@ public function prepareRow(Row $row) {
               // The database API won't allow colons in column aliases, so we
               // will accept the default alias, and fix up the field names later.
               // Remember how to translate the field names.
-              $clean_name = str_replace(':', '_', $display_name);
-              //$this->fixFieldNames[$clean_name] = $display_name;
               if ($info['type'] == 'filefield' &&
                 (strpos($display_name, ':list') || strpos($display_name, ':description'))) {
                 if (!$data) {
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Comment.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Comment.php
index e343045..96b3802 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Comment.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Comment.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Comment.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Comment.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ContactCategory.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ContactCategory.php
index cdddc52..19e2dba 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ContactCategory.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ContactCategory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\ContactCategory.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactCategory.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Field.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Field.php
index 82e9bf7..542fde2 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Field.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Field.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Field.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Field.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstance.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstance.php
index 4f8c031..e6f4721 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstance.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstance.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\FieldInstance.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FieldInstance.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
index 7156465..056083d 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
@@ -2,12 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\FieldInstancePerViewMode.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FieldInstancePerFormDisplay.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstancePerViewMode.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
index 4f76ee8..cda2398 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
@@ -2,13 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\FieldInstancePerViewMode.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FieldInstancePerViewMode.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
-use Drupal\migrate\Entity\MigrationInterface;
-
 /**
  * The field instance per view mode source class.
  *
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/File.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/File.php
index f1ada5f..887bdd9 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/File.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/File.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\File.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\File.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FilterFormat.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FilterFormat.php
index 993f7b0..62c211f 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FilterFormat.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/FilterFormat.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\FilterFormats.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FilterFormats.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Menu.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Menu.php
index 7c9d946..b280b0f 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Menu.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Menu.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Menu.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Menu.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Node.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Node.php
index 9756641..4c0edcd 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Node.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Node.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Node.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Node.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
@@ -10,7 +10,6 @@
 use Drupal\migrate\Plugin\SourceEntityInterface;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
-
 /**
  * Drupal 6 node source from database.
  *
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/NodeRevision.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/NodeRevision.php
index 3171c7b..87907d3 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/NodeRevision.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/NodeRevision.php
@@ -2,7 +2,7 @@
 
 /**
 * @file
-* Contains \Drupal\migrate\Plugin\migrate\source\d6\NodeRevision.
+* Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision.
 */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/NodeType.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/NodeType.php
index 94abb9c..4120de3 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/NodeType.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/NodeType.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\NodeType.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeType.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileField.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileField.php
index f149a20..e16fa9e 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileField.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileField.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\ProfileField.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ProfileField.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileFieldValues.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileFieldValues.php
index b561b2a..790a42f 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileFieldValues.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileFieldValues.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\ProfileFieldValues.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ProfileFieldValues.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Role.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Role.php
index f8e540d..754d6cd 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Role.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Role.php
@@ -2,12 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Role.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Role.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
-
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Term.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Term.php
index 5b888e2..98aac3d 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Term.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Term.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Term.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Term.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Upload.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Upload.php
index a991998..8fed280 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Upload.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Upload.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Upload.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Upload.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UploadInstance.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UploadInstance.php
index 0f9c60b..6e3db8d 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UploadInstance.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UploadInstance.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\UploadInstance.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\UploadInstance.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
@@ -76,7 +77,7 @@ public function checkRequirements() {
    * {@inheritdoc
    */
   public function fields() {
-    $fields = array(
+    return array(
       'node_type' => $this->t('Node type'),
       'max_filesize' => $this->t('Max filesize'),
       'file_extensions' => $this->t('File extensions'),
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UrlAlias.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UrlAlias.php
index 67241dd..d9b08da 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UrlAlias.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UrlAlias.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\UrlAlias.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\UrlAlias.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/User.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/User.php
index 410ad47..058f7ed 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/User.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/User.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\User.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\User.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPicture.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPicture.php
index dc5e04d..9efa99d 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPicture.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPicture.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\UserPicture.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\UserPicture.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
-use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
  * Drupal 6 user picture source from database.
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPictureFile.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPictureFile.php
index e08cfe0..757472d 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPictureFile.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPictureFile.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\UserPictureFile.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\UserPictureFile.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPictureInstance.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPictureInstance.php
index b239a16..03402ce 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPictureInstance.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserPictureInstance.php
@@ -2,14 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\UserPictureInstance.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\UserPictureInstance.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
-
 /**
  * Drupal 6 user picture field instance source.
  *
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ViewMode.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ViewMode.php
index a894817..13d6c94 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ViewMode.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ViewMode.php
@@ -2,14 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\ViewMode.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewMode.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Row;
-
 /**
  * The view mode source.
  *
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ViewModeBase.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ViewModeBase.php
index e364032..a32f8ca 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ViewModeBase.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ViewModeBase.php
@@ -2,13 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\ViewModeBase.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewModeBase.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Vocabulary.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Vocabulary.php
index 713b8f9..9e51196 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Vocabulary.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Vocabulary.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Vocabulary.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Vocabulary.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/VocabularyBase.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/VocabularyBase.php
index be77aa0..e5f1159 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/VocabularyBase.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/VocabularyBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\VocabularyBase.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\VocabularyBase.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/VocabularyPerType.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/VocabularyPerType.php
index 6295afb..46f3d2d 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/VocabularyPerType.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/VocabularyPerType.php
@@ -2,13 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\Vocabulary.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\VocabularyPerType.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
-use Drupal\migrate\Row;
-
 /**
  * Gets all the vocabularies based on the node types that have Taxonomy enabled.
  *
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6AggregatorFeed.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6AggregatorFeed.php
index 8710662..5d74e0c 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6AggregatorFeed.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6AggregatorFeed.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\Dump\Drupal6Feed.
+ * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6Feed.
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6AggregatorItem.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6AggregatorItem.php
index c866631..b4f1ad2 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6AggregatorItem.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6AggregatorItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\Dump\Drupal6AggregatorItem.
+ * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6AggregatorItem.
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6FieldInstance.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6FieldInstance.php
index 77500e2..9753a38 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6FieldInstance.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6FieldInstance.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\Dump\Drupal6FieldInstance.
+ * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6FieldInstance.
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6FilterFormat.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6FilterFormat.php
index 002e6b8..edfa35a 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6FilterFormat.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6FilterFormat.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\Dump\Drupal6FilterFormats.
+ * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6FilterFormats.
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6SearchSettings.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6SearchSettings.php
index fffc6c7..e6c8ea0 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6SearchSettings.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6SearchSettings.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\Drupal6SearchSettings.
+ * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6SearchSettings.
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserProfileFields.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserProfileFields.php
index 60e90df..3d3d017 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserProfileFields.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserProfileFields.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\Dump\Drupal6UserProfileFields.
+ * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6UserProfileFields.
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php
index 12283bb..4c91ed9 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\Dump\Drupal6UserRole.
+ * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6UserRole.
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
+
 /**
  * Database dump for testing user role migration.
  */
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableDisplayBase.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableDisplayBase.php
index 9a87345..787d09a 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableDisplayBase.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableDisplayBase.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableDisplayBase.
  */
 
-
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\migrate\MigrateExecutable;
@@ -17,6 +16,14 @@
 abstract class MigrateCommentVariableDisplayBase extends MigrateDrupalTestBase {
 
   /**
+   * The ID of migration to run.
+   *
+   * This constant needs to be set in the concrete class in order for the test
+   * to work.
+   */
+  const MIGRATION = '';
+
+  /**
    * Modules to enable.
    *
    * @var array
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableEntityDisplay.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableEntityDisplay.php
index c702f0c..4d9ca86 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableEntityDisplay.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableEntityDisplay.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-
 /**
  * Tests comment variables migrated into an entity display.
  */
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableEntityFormDisplay.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableEntityFormDisplay.php
index 4d1700a..c58d55b 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableEntityFormDisplay.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCommentVariableEntityFormDisplay.php
@@ -6,7 +6,6 @@
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
-use Drupal\migrate\MigrateExecutable;
 
 /**
  * Tests comment variables migrated into an entity display.
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateFieldFormatterSettingsTest.php
index 9205c80..2cbc837 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateFieldFormatterSettingsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\d6\MigrateFieldInstanceEntityDisplayTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFieldFormatterSettingsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateFilterFormatTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateFilterFormatTest.php
index 64ac4f9..fdb7d2b 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateFilterFormatTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateFilterFormatTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateD6FilterFormatTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFilterFormatTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateNodeTypeTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateNodeTypeTest.php
index 857d6de..6867bc2 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateNodeTypeTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateNodeTypeTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
+use Drupal\field\Field;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
 
@@ -70,7 +71,7 @@ public function testNodeType() {
     $this->assertEqual(array('test_page'), $migration->getIdMap()->lookupDestinationID(array('test_page')));
 
     // Test we have a body field.
-    $instance = field_info_instance('node', 'body', 'test_page');
+    $instance = Field::fieldInfo()->getInstance('node', 'test_page', 'body');
     $this->assertEqual($instance->getLabel(), 'Body', 'Body field was found.');
 
     // Test the test_story content type.
@@ -90,7 +91,7 @@ public function testNodeType() {
     $this->assertEqual(array('test_story'), $migration->getIdMap()->lookupDestinationID(array('test_story')));
 
     // Test we don't have a body field.
-    $instance = field_info_instance('node', 'body', 'test_story');
+    $instance = Field::fieldInfo()->getInstance('node', 'test_story', 'body');
     $this->assertEqual($instance, NULL, 'No body field found');
   }
 }
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUploadTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUploadTest.php
index 0c10228..1c2f95b 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUploadTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUploadTest.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
+
 use Drupal\migrate\MigrateExecutable;
 
 /**
@@ -45,8 +46,7 @@ function testUpload() {
     $this->assertEqual($node->upload[0]->target_id, 1);
     $this->assertEqual($node->upload[0]->description, 'file 1-1-1');
     $this->assertEqual($node->upload[0]->isDisplayed(), FALSE);
-    // @TODO: remove this.
-    return;
+
     $node = $nodes[2];
     $this->assertEqual(count($node->upload), 2);
     $this->assertEqual($node->upload[0]->target_id, 3);
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateViewModesTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateViewModesTest.php
index 81f8279..b504e1e 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateViewModesTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateViewModesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\d6\MigrateFieldInstanceViewModeTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateViewModesTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/dependencies/MigrateDependenciesTest.php
index 7caf5e1..f9a53f3 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/dependencies/MigrateDependenciesTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/dependencies/MigrateDependenciesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateDependenciesTest.
+ * Contains \Drupal\migrate_drupal\Tests\dependencies\MigrateDependenciesTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\dependencies;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/destination/ConfigDestinationTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/destination/ConfigDestinationTest.php
index 971e0e0..172b2a0 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/destination/ConfigDestinationTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/destination/ConfigDestinationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\ConfigDestinationTest.
+ * Contains \Drupal\migrate_drupal\Tests\destination\ConfigDestinationTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\destination;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableMultiRowSourceWithHighwaterTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableMultiRowSourceWithHighwaterTest.php
index ea93ffd..55341dc 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableMultiRowSourceWithHighwaterTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableMultiRowSourceWithHighwaterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\VariableMultiRowSourceWithHighwaterTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\VariableMultiRowSourceWithHighwaterTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableMultiRowTestBase.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableMultiRowTestBase.php
index 4f51aeb..bed79e9 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableMultiRowTestBase.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableMultiRowTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\VariableMultiRowTestBase.
+ * Contains \Drupal\migrate_drupal\Tests\source\VariableMultiRowTestBase.
  */
 
 namespace Drupal\migrate_drupal\Tests\source;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ActionTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ActionTest.php
index bbff96a..d6dd2ea 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ActionTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ActionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\ActionTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\ActionTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/AggregatorFeedTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/AggregatorFeedTest.php
index 72441f4..9184dea 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/AggregatorFeedTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/AggregatorFeedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\AggregatorFeedTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\AggregatorFeedTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/AggregatorItemTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/AggregatorItemTest.php
index a5d146e..cfa88cc 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/AggregatorItemTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/AggregatorItemTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\AggregatorItemTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\AggregatorItemTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
@@ -54,6 +54,7 @@ class AggregatorItemTest extends MigrateSqlSourceTestCase {
       'guid' => '395218 at https://groups.drupal.org',
     ),
   ));
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/BlockTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/BlockTest.php
index d5aaa36..2a02af9 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/BlockTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/BlockTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\BlockTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\BlockTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/BoxTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/BoxTest.php
index 568f126..d43cf5d 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/BoxTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/BoxTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\BoxesTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\BoxesTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/CommentSourceWithHighwaterTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/CommentSourceWithHighwaterTest.php
index 016ff94..1e4c4dd 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/CommentSourceWithHighwaterTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/CommentSourceWithHighwaterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\CommentSourceTestWithHighwater.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\CommentSourceTestWithHighwater.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/CommentTestBase.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/CommentTestBase.php
index 18d84cf..dcfb701 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/CommentTestBase.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/CommentTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\CommentTestBase.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\CommentTestBase.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
@@ -91,18 +91,3 @@ protected function setUp() {
   }
 
 }
-
-namespace Drupal\migrate_drupal\Tests\source\d6;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate_drupal\Plugin\migrate\source\d6\Comment;
-
-class TestComment extends Comment {
-  public function setDatabase(Connection $database) {
-    $this->database = $database;
-  }
-  public function setModuleHandler(ModuleHandlerInterface $module_handler) {
-    $this->moduleHandler = $module_handler;
-  }
-}
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ContactCategoryTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ContactCategoryTest.php
index 1b43e7d..870d1cb 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ContactCategoryTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ContactCategoryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\ContactCategoryTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\ContactCategoryTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/Drupal6SqlBaseTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/Drupal6SqlBaseTest.php
index 7136d51..b8c7c96 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/Drupal6SqlBaseTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/Drupal6SqlBaseTest.php
@@ -142,7 +142,7 @@ public function testVariableGet() {
 /**
  * Extends the Drupal6SqlBase abstract class.
  */
-class TestDrupal6SqlBase extends \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase {
+class TestDrupal6SqlBase extends DrupalSqlBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FieldInstanceTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FieldInstanceTest.php
index e2e5573..3c8abcf 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FieldInstanceTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FieldInstanceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\FieldInstanceTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\FieldInstanceTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FieldTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FieldTest.php
index 9310024..e1403d1 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FieldTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\FieldTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\FieldTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FileTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FileTest.php
index b06d27a..c8a7505 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FileTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FileTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\FileTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\FileTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
@@ -18,8 +18,6 @@
 class FileTest extends MigrateSqlSourceTestCase {
 
   const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\File';
-  const BASE_TABLE = 'file';
-  const BASE_ALIAS = 'f';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FilterFormatTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FilterFormatTest.php
index 5a1b2b5..11468df 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FilterFormatTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/FilterFormatTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\FilterFormatsTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\FilterFormatTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/MenuTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/MenuTest.php
index 0127047..081c462 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/MenuTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/MenuTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\MenuTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\MenuTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeRevisionTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeRevisionTest.php
index 4ff08dd..d895ed5 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeRevisionTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeRevisionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\NodeRevisionTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\NodeRevisionTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeTest.php
index dc21bf3..311f938 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\NodeTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\NodeTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeTypeTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeTypeTest.php
index c67219c..e38aba6 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeTypeTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/NodeTypeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\NodeTypeTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\NodeTypeTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ProfileFieldTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ProfileFieldTest.php
index a05e338..80728df 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ProfileFieldTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ProfileFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\ProfileFieldTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\ProfileFieldTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
@@ -34,7 +34,7 @@ class ProfileFieldTest extends MigrateSqlSourceTestCase {
 
   // We need to set up the database contents; it's easier to do that below.
   // These are sample result queries.
-  //TODO: Add multiple cases
+  // @todo Add multiple cases.
   protected $expectedResults = array(
     array(
       'fid' => 1,
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TermSourceWithVocabularyFilterTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TermSourceWithVocabularyFilterTest.php
index cd60c86..8149094 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TermSourceWithVocabularyFilterTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TermSourceWithVocabularyFilterTest.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
  * @file
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\TermSourceWithVocabularyFilterTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
-
-
 /**
  * Tests the Drupal 6 taxonomy term source with vocabulary filter.
  *
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TermTestBase.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TermTestBase.php
index 7b9580e..e4d5f08 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TermTestBase.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TermTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\TermTestBase.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\TermTestBase.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
@@ -105,18 +105,3 @@ protected function setUp() {
   }
 
 }
-
-namespace Drupal\migrate_drupal\Tests\source\d6;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate_drupal\Plugin\migrate\source\d6\Term ;
-
-class TestTerm extends Term {
-  public function setDatabase(Connection $database) {
-    $this->database = $database;
-  }
-  public function setModuleHandler(ModuleHandlerInterface $module_handler) {
-    $this->moduleHandler = $module_handler;
-  }
-}
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TestTerm.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TestTerm.php
index bf822c9..f8fdf36 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TestTerm.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/TestTerm.php
@@ -2,10 +2,9 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\TestTerm.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\TestTerm.
  */
 
-
 namespace Drupal\migrate_drupal\Tests\source\d6;
 
 use Drupal\Core\Database\Connection;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UrlAliasTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UrlAliasTest.php
index 6c81674..c5d584e 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UrlAliasTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UrlAliasTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\UrlAliasTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\UrlAliasTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserPictureTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserPictureTest.php
index 633064e..ce6beed 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserPictureTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserPictureTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\UserPictureTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\UserPictureTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserTest.php
index af2aefe..17e93bb 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\CommentTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\CommentTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/VocabularyTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/VocabularyTest.php
index b58e8fa..d4b6ab0 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/VocabularyTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/VocabularyTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\VocabularyTest.
+ * Contains \Drupal\migrate_drupal\Tests\source\d6\VocabularyTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;