diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityImageStyle.php b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityImageStyle.php
index 8eaa388..6207dc6 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityImageStyle.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityImageStyle.php
@@ -25,10 +25,9 @@ class EntityImageStyle extends EntityConfigBase {
   /**
    * {@inheritdoc}
    *
-   * @throws MigrateException
-   *
+   * @throws \Drupal\migrate\MigrateException
    */
-  public function import (Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = array()) {
     $effects = array();
 
     // Need to set the effects property to null on the row before the ImageStyle
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/ImageCacheActions.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/ImageCacheActions.php
index d8c9315..779bbfd 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/ImageCacheActions.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/ImageCacheActions.php
@@ -21,12 +21,12 @@ class ImageCacheActions extends ProcessPluginBase {
   /**
    * {@inheritdoc}
    */
-  public function transform ($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     $effects = array();
 
     foreach ($row->getSourceProperty('actions') as $action) {
       $effects[] = array(
-        'id'     => str_replace('imagecache', 'image', $action['action']),
+        'id'     => preg_replace('/^imagecache/', 'image', $action['action']),
         'weight' => $action['weight'],
         'data'   => $action['data'],
       );