diff --git a/migrate_example/config/migrate.migration.migrate_example_content.yml b/migrate_example/config/migrate.migration.migrate_example_content.yml
index 4a04103..419fc41 100644
--- a/migrate_example/config/migrate.migration.migrate_example_content.yml
+++ b/migrate_example/config/migrate.migration.migrate_example_content.yml
@@ -2,8 +2,7 @@ id: migrate_example_content
 source:
   plugin: migrate_example_content
 destination:
-  plugin: entity
-  entity_type: node
+  plugin: entity:node
   type: page
 process:
   title: subject
diff --git a/migrate_example/config/migrate.migration.migrate_example_people.yml b/migrate_example/config/migrate.migration.migrate_example_people.yml
index 7020954..57ba350 100644
--- a/migrate_example/config/migrate.migration.migrate_example_people.yml
+++ b/migrate_example/config/migrate.migration.migrate_example_people.yml
@@ -2,7 +2,7 @@ id: migrate_example_people
 source:
   plugin: migrate_example_people
 destination:
-  plugin: entity_user
+  plugin: entity:user
   md5_passwords: true
 process:
   name:
@@ -17,6 +17,13 @@ process:
       callable:
         - '\Drupal\Component\Utility\Unicode'
         - strtolower
+    -
+      plugin: callback
+      callable: trim
+    -
+      plugin: dedupe_entity
+      entity_type: user
+      field: name
   mail: email
   pass: pass
   roles:
diff --git a/migrate_example/config/migrate.migration.migrate_example_user_role.yml b/migrate_example/config/migrate.migration.migrate_example_user_role.yml
index b16582c..fe3ed04 100644
--- a/migrate_example/config/migrate.migration.migrate_example_user_role.yml
+++ b/migrate_example/config/migrate.migration.migrate_example_user_role.yml
@@ -2,8 +2,7 @@ id: migrate_example_user_role
 source:
   plugin: migrate_example_user_role
 destination:
-  plugin: entity
-  entity_type: user_role
+  plugin: entity:user_role
 process:
   id:
     -
diff --git a/migrate_example/lib/Drupal/migrate_example/Tests/MigrateExamplePeopleTest.php b/migrate_example/lib/Drupal/migrate_example/Tests/MigrateExamplePeopleTest.php
index aea4b5d..ac0224f 100644
--- a/migrate_example/lib/Drupal/migrate_example/Tests/MigrateExamplePeopleTest.php
+++ b/migrate_example/lib/Drupal/migrate_example/Tests/MigrateExamplePeopleTest.php
@@ -42,7 +42,7 @@ class MigrateExamplePeopleTest extends MigrateExampleTestBase {
       $user = entity_load('user', $uid);
 
       // Assertions.
-      $name = Unicode::strtolower($person->first_name . '.' . $person->last_name);
+      $name = trim(Unicode::strtolower($person->first_name . '.' . $person->last_name));
       $this->assertEqual($user->label(), $name);
       $this->assertEqual($user->mail->value, $person->email);