diff -u b/migrate_tools/src/MigrateExecutable.php b/migrate_tools/src/MigrateExecutable.php
--- b/migrate_tools/src/MigrateExecutable.php
+++ b/migrate_tools/src/MigrateExecutable.php
@@ -8,14 +8,15 @@
 namespace Drupal\migrate_tools;
 
 use Drupal\migrate\MigrateExecutable as MigrateExecutableBase;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateMessageInterface;
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate\MigrateEvents;
-use Drupal\migrate\MigrateMapSaveEvent;
-use Drupal\migrate\MigrateMapDeleteEvent;
-use Drupal\migrate\MigratePostImportEvent;
-use Drupal\migrate\MigratePostSaveEvent;
+use Drupal\migrate\Event\MigrateEvents;
+use Drupal\migrate\Event\MigrateMapSaveEvent;
+use Drupal\migrate\Event\MigrateMapDeleteEvent;
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Event\MigratePostRowSaveEvent;
 
 class MigrateExecutable extends MigrateExecutableBase {
 
@@ -138,7 +139,7 @@
   /**
    * Count up any map save events.
    *
-   * @param \Drupal\migrate\MigrateMapSaveEvent $event
+   * @param \Drupal\migrate\Event\MigrateMapSaveEvent $event
    *   The map event.
    */
   public function onMapSave(MigrateMapSaveEvent $event) {
@@ -149,7 +150,7 @@
   /**
    * Count up any rollback events.
    *
-   * @param \Drupal\migrate\MigrateMapDeleteEvent $event
+   * @param \Drupal\migrate\Event\MigrateMapDeleteEvent $event
    *   The map event.
    */
   public function onMapDelete(MigrateMapDeleteEvent $event) {
@@ -218,10 +219,10 @@
   /**
    * React to migration completion.
    *
-   * @param \Drupal\migrate\MigratePostImportEvent $event
+   * @param \Drupal\migrate\Event\MigrateImportEvent $event
    *   The map event.
    */
-  public function onPostImport(MigratePostImportEvent $event) {
+  public function onPostImport(MigrateImportEvent $event) {
     $migrate_last_imported_store = \Drupal::keyValue('migrate_last_imported');
     $migrate_last_imported_store->set($event->getMigration()->id(), round(microtime(TRUE) * 1000));
     $this->progressMessage();
@@ -255,10 +256,10 @@
   /**
    * React to item import.
    *
-   * @param \Drupal\migrate\MigratePostSaveEvent $event
+   * @param \Drupal\migrate\Event\MigratePostRowSaveEvent $event
    *   The post-save event.
    */
-  public function onPostSave(MigratePostSaveEvent $event) {
+  public function onPostSave(MigratePostRowSaveEvent $event) {
     $migration = $event->getMigration();
     if ($this->feedback && ($this->counter) && $this->counter % $this->feedback == 0) {
       $this->progressMessage(FALSE);