diff --git a/modules/book/book.module b/modules/book/book.module
index beb1721..ae2e416 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -219,9 +219,9 @@ function book_admin_paths() {
 /**
  * Implements hook_entity_info_alter().
  */
-function book_entity_info_alter(&$info) {
+function book_entity_info_alter(&$entity_info) {
   // Add the 'Print' view mode for nodes.
-  $info['node']['view modes'] += array(
+  $entity_info['node']['view modes'] += array(
     'print' => array(
       'label' => t('Print'),
       'custom settings' => FALSE,
diff --git a/modules/color/color.module b/modules/color/color.module
index 624575d..d326341 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -72,7 +72,7 @@ function _color_theme_select_form_alter(&$form, &$form_state) {
 /**
  * Callback for the theme to alter the resources used.
  */
-function _color_html_alter(&$vars) {
+function _color_html_alter(&$variables) {
   global $theme_key;
   $themes = list_themes();
 
@@ -89,25 +89,25 @@ function _color_html_alter(&$vars) {
         if (basename($old_path) == basename($color_path)) {
           // Replace the path to the new css file.
           // This keeps the order of the stylesheets intact.
-          $vars['css'][$old_path]['data'] = $color_path;
+          $variables['css'][$old_path]['data'] = $color_path;
         }
       }
     }
 
-    $vars['styles'] = drupal_get_css($vars['css']);
+    $variables['styles'] = drupal_get_css($variables['css']);
   }
 }
 
 /**
  * Callback for the theme to alter the resources used.
  */
-function _color_page_alter(&$vars) {
+function _color_page_alter(&$variables) {
   global $theme_key;
 
   // Override logo.
   $logo = variable_get('color_' . $theme_key . '_logo');
-  if ($logo && $vars['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $vars['logo'])) {
-    $vars['logo'] = file_create_url($logo);
+  if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $variables['logo'])) {
+    $variables['logo'] = file_create_url($logo);
   }
 }
 
diff --git a/modules/field/tests/field_test.module b/modules/field/tests/field_test.module
index 4075296..0a914ce 100644
--- a/modules/field/tests/field_test.module
+++ b/modules/field/tests/field_test.module
@@ -209,7 +209,7 @@ function field_test_field_delete($entity_type, $entity, $field, $instance, $item
 /**
  * Implements hook_entity_query_alter().
  */
-function field_test_entity_query_alter(&$query) {
+function field_test_entity_query_alter($query) {
   if (!empty($query->alterMyExecuteCallbackPlease)) {
     $query->executeCallback = 'field_test_dummy_field_storage_query';
   }
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index c58b5c9..14f4e01 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -214,7 +214,7 @@ function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) {
 /**
  * Implements hook_entity_info_alter().
  */
-function forum_entity_info_alter(&$info) {
+function forum_entity_info_alter(&$entity_info) {
   // Take over URI constuction for taxonomy terms that are forums.
   if ($vid = variable_get('forum_nav_vocabulary', 0)) {
     // Within hook_entity_info(), we can't invoke entity_load() as that would
@@ -226,7 +226,7 @@ function forum_entity_info_alter(&$info) {
     // and is done as part of taxonomy_entity_info() anyway.
     foreach (taxonomy_vocabulary_get_names() as $machine_name => $vocabulary) {
       if ($vid == $vocabulary->vid) {
-        $info['taxonomy_term']['bundles'][$machine_name]['uri callback'] = 'forum_uri';
+        $entity_info['taxonomy_term']['bundles'][$machine_name]['uri callback'] = 'forum_uri';
       }
     }
   }
diff --git a/modules/simpletest/tests/xmlrpc_test.module b/modules/simpletest/tests/xmlrpc_test.module
index db8f113..16f6f41 100644
--- a/modules/simpletest/tests/xmlrpc_test.module
+++ b/modules/simpletest/tests/xmlrpc_test.module
@@ -67,10 +67,10 @@ function xmlrpc_test_xmlrpc() {
  *
  * Hide (or not) the system.methodSignature() service depending on a variable.
  */
-function xmlrpc_test_xmlrpc_alter(&$services) {
+function xmlrpc_test_xmlrpc_alter(&$methods) {
   if (variable_get('xmlrpc_test_xmlrpc_alter', FALSE)) {
     $remove = NULL;
-    foreach ($services as $key => $value) {
+    foreach ($methods as $key => $value) {
       if (!is_array($value)) {
         continue;
       }
@@ -80,7 +80,7 @@ function xmlrpc_test_xmlrpc_alter(&$services) {
       }
     }
     if (isset($remove)) {
-      unset($services[$remove]);
+      unset($methods[$remove]);
     }
   }
 }
diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module
index 61ae648..f28db68 100644
--- a/modules/toolbar/toolbar.module
+++ b/modules/toolbar/toolbar.module
@@ -139,11 +139,11 @@ function toolbar_pre_render($toolbar) {
  *
  * Add some page classes, so global page theming can adjust to the toolbar.
  */
-function toolbar_preprocess_html(&$vars) {
-  if (isset($vars['page']['page_top']['toolbar']) && user_access('access toolbar')) {
-    $vars['classes_array'][] = 'toolbar';
+function toolbar_preprocess_html(&$variables) {
+  if (isset($variables['page']['page_top']['toolbar']) && user_access('access toolbar')) {
+    $variables['classes_array'][] = 'toolbar';
     if (!_toolbar_is_collapsed()) {
-      $vars['classes_array'][] = 'toolbar-drawer';
+      $variables['classes_array'][] = 'toolbar-drawer';
     }
   }
 }
diff --git a/modules/update/tests/update_test.module b/modules/update/tests/update_test.module
index 4e32d33..8c308d8 100644
--- a/modules/update/tests/update_test.module
+++ b/modules/update/tests/update_test.module
@@ -27,7 +27,7 @@ function update_test_menu() {
  * theme short name ($file->name) and the subarrays contain settings just for
  * that module or theme.
  */
-function update_test_system_info_alter(&$info, $file) {
+function update_test_system_info_alter(&$info, $file, $type) {
   $setting = variable_get('update_test_system_info', array());
   foreach (array('#all', $file->name) as $id) {
     if (!empty($setting[$id])) {
diff --git a/modules/user/user.module b/modules/user/user.module
index 044ad46..a7ff46f 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1837,29 +1837,29 @@ function user_menu_site_status_alter(&$menu_site_status, $path) {
 /**
  * Implements hook_menu_link_alter().
  */
-function user_menu_link_alter(&$link) {
+function user_menu_link_alter(&$item) {
   // The path 'user' must be accessible for anonymous users, but only visible
   // for authenticated users. Authenticated users should see "My account", but
   // anonymous users should not see it at all. Therefore, invoke
   // user_translated_menu_link_alter() to conditionally hide the link.
-  if ($link['link_path'] == 'user' && $link['module'] == 'system') {
-    $link['options']['alter'] = TRUE;
+  if ($item['link_path'] == 'user' && $item['module'] == 'system') {
+    $item['options']['alter'] = TRUE;
   }
 
   // Force the Logout link to appear on the top-level of 'user-menu' menu by
   // default (i.e., unless it has been customized).
-  if ($link['link_path'] == 'user/logout' && $link['module'] == 'system' && empty($link['customized'])) {
-    $link['plid'] = 0;
+  if ($item['link_path'] == 'user/logout' && $item['module'] == 'system' && empty($item['customized'])) {
+    $item['plid'] = 0;
   }
 }
 
 /**
  * Implements hook_translated_menu_link_alter().
  */
-function user_translated_menu_link_alter(&$link) {
+function user_translated_menu_link_alter(&$item, $map) {
   // Hide the "User account" link for anonymous users.
-  if ($link['link_path'] == 'user' && $link['module'] == 'system' && user_is_anonymous()) {
-    $link['hidden'] = 1;
+  if ($item['link_path'] == 'user' && $item['module'] == 'system' && user_is_anonymous()) {
+    $item['hidden'] = 1;
   }
 }
 
diff --git a/themes/seven/template.php b/themes/seven/template.php
index 4582749..6775f29 100644
--- a/themes/seven/template.php
+++ b/themes/seven/template.php
@@ -3,19 +3,19 @@
 /**
  * Override or insert variables into the maintenance page template.
  */
-function seven_preprocess_maintenance_page(&$vars) {
+function seven_preprocess_maintenance_page(&$variables) {
   // While markup for normal pages is split into page.tpl.php and html.tpl.php,
   // the markup for the maintenance page is all in the single
   // maintenance-page.tpl.php template. So, to have what's done in
   // seven_preprocess_html() also happen on the maintenance page, it has to be
   // called here.
-  seven_preprocess_html($vars);
+  seven_preprocess_html($variables);
 }
 
 /**
  * Override or insert variables into the html template.
  */
-function seven_preprocess_html(&$vars) {
+function seven_preprocess_html(&$variables) {
   // Add conditional CSS for IE8 and below.
   drupal_add_css(path_to_theme() . '/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'preprocess' => FALSE));
   // Add conditional CSS for IE6.