diff --git a/web/modules/custom/geo_upgrade/migrations/upgrade_d7_user_role.yml b/web/modules/custom/geo_upgrade/migrations/upgrade_d7_user_role.yml
index a7076f7..2e816de 100644
--- a/web/modules/custom/geo_upgrade/migrations/upgrade_d7_user_role.yml
+++ b/web/modules/custom/geo_upgrade/migrations/upgrade_d7_user_role.yml
@@ -17,32 +17,23 @@ process:
     -
       plugin: machine_name
       source: name
+    -
+      plugin: static_map
+      map:
+        'administrator': 'manager'
+        'proofreader': 'contributor'
+        'content_administrator': 'editor'
+      bypass: TRUE
     -
       plugin: user_update_8002
   label:
-    -
-      plugin: get
-      source: name
-  permissions:
     -
       plugin: static_map
-      source: permissions
-      bypass: true
+      source: name
       map:
-        'use PHP for block visibility': 'use PHP for settings'
-        'administer site-wide contact form': 'administer contact forms'
-        'post comments without approval': 'skip comment approval'
-        'edit own blog entries': 'edit own blog content'
-        'edit any blog entry': 'edit any blog content'
-        'delete own blog entries': 'delete own blog content'
-        'delete any blog entry': 'delete any blog content'
-        'create forum topics': 'create forum content'
-        'delete any forum topic': 'delete any forum content'
-        'delete own forum topics': 'delete own forum content'
-        'edit any forum topic': 'edit any forum content'
-        'edit own forum topics': 'edit own forum content'
-    -
-      plugin: flatten
+        'administrator': 'manager'
+        'proofreader': 'contributor'
+        'content administrator': 'editor'
   weight:
     -
       plugin: get