diff --git a/conditional_fields.install b/conditional_fields.install
index 9ee2375..98aa7c9 100644
--- a/conditional_fields.install
+++ b/conditional_fields.install
@@ -103,15 +103,9 @@ function conditional_fields_update_7000() {
     throw new DrupalUpdateException('Before upgrading Conditional Fields from Drupal 6 you must upgrade your fields definitions using the Content Migrate module. Follow the CCK migration to Drupal 7 documentation at http://drupal.org/node/1144136 and then run update.php again, leaving the Content Migrate module activated. After the update, you can safely disable the Content Migrate module. Warning: if you don\'t migrate your fields before rerunning this update you might lose all your defined dependencies!');
   }
 
-  // Update permission to new name.
-  db_update('role_permission')
-    ->fields(array('permission' => 'administer dependencies'))
-    ->condition('permission', 'administer conditional fields')
-    ->execute();
-
   $dependencies = array();
   $node_types = node_type_get_names();
-  $administrator_roles = user_roles(FALSE, 'administer dependencies');
+  $administrator_roles = user_roles(FALSE, 'administer conditional fields');
 
   $default_options = array(
     'selector'              => '',
@@ -301,3 +295,16 @@ function conditional_fields_update_7001() {
 function conditional_fields_update_7002() {
   // Do nothing; it's here just to let Drupal rebuild the menu cache.
 }
+
+/**
+ * Update permissions due to change in permission name.
+ *
+ * Grants anybody who had 'administer dependencies' permission the renamed
+ * 'administer conditional fields' permission.
+ */
+function conditional_fields_update_7003() {
+  db_update('role_permission')
+    ->fields(array('permission' => 'administer conditional fields'))
+    ->condition('permission', 'administer dependencies')
+    ->execute();
+}
diff --git a/conditional_fields.module b/conditional_fields.module
index 31c76ec..d32c61b 100644
--- a/conditional_fields.module
+++ b/conditional_fields.module
@@ -87,9 +87,9 @@ define('CONDITIONAL_FIELDS_FIELD_EDIT_RESET_UNTRIGGERED', 3);
  */
 function conditional_fields_permission() {
   return array(
-    'administer dependencies' => array(
-      'title' => t('Administer dependencies'),
-      'description' => t('View, edit and delete field dependencies.'),
+    'administer conditional fields' => array(
+      'title' => t('Administer conditional fields'),
+      'description' => t('View, edit and delete conditional field dependencies.'),
     ),
   );
 }
@@ -110,7 +110,7 @@ function conditional_fields_menu() {
     'title' => 'Field dependencies',
     'description' =>  'Administer field dependencies for the site.',
     'page callback' => 'conditional_fields_dependencies_overview_page',
-    'access arguments' => array('administer dependencies'),
+    'access arguments' => array('administer conditional fields'),
     'file' => 'includes/conditional_fields.admin.inc',
   );
 
@@ -124,7 +124,7 @@ function conditional_fields_menu() {
     'title' => 'Edit dependency',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('conditional_fields_dependency_edit_form', 4),
-    'access arguments' => array('administer dependencies'),
+    'access arguments' => array('administer conditional fields'),
     'file' => 'includes/conditional_fields.admin.inc',
   );
 
@@ -132,7 +132,7 @@ function conditional_fields_menu() {
     'title' => 'Delete dependency',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('conditional_fields_dependency_delete_form', 4),
-    'access arguments' => array('administer dependencies'),
+    'access arguments' => array('administer conditional fields'),
     'file' => 'includes/conditional_fields.admin.inc',
   );
 
@@ -144,7 +144,7 @@ function conditional_fields_menu() {
       $items["admin/structure/dependencies/$entity_type"] = array(
         'title' => $entity_info['label'],
         'page arguments' => array(NULL, 3),
-        'access arguments' => array('administer dependencies'),
+        'access arguments' => array('administer conditional fields'),
         'type' => MENU_LOCAL_TASK,
         'weight' => 2,
       );
@@ -169,7 +169,7 @@ function conditional_fields_menu() {
             'type' => MENU_LOCAL_TASK,
             'weight' => $entity_type == 'comment' ? 4 : 2,
             'file' => 'includes/conditional_fields.admin.inc',
-            'access arguments' => array('administer dependencies'),
+            'access arguments' => array('administer conditional fields'),
           );
         }
       }