diff --git a/modules/taxonomy/views_handler_field_term_node_tid.inc b/modules/taxonomy/views_handler_field_term_node_tid.inc
index 4c6362e5d030d4017d5943a7c847b59ed322afdc..6b9c93ac91209bd079a187d38641b38b1a4509cf 100644
--- a/modules/taxonomy/views_handler_field_term_node_tid.inc
+++ b/modules/taxonomy/views_handler_field_term_node_tid.inc
@@ -23,7 +23,7 @@ function init(&$view, &$options) {
 
     // Convert legacy vids option to machine name vocabularies.
     if (!empty($this->options['vids'])) {
-      $vocabularies = taxonomy_get_vocabularies();
+      $vocabularies = taxonomy_vocabulary_get_names();
       foreach ($this->options['vids'] as $vid) {
         if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
           $this->options['vocabularies'][$vocabularies[$vid]->machine_name] = $vocabularies[$vid]->machine_name;
@@ -59,7 +59,7 @@ function options_form(&$form, &$form_state) {
     );
 
     $options = array();
-    $vocabularies = taxonomy_get_vocabularies();
+    $vocabularies = taxonomy_vocabulary_get_names();
     foreach ($vocabularies as $voc) {
       $options[$voc->machine_name] = check_plain($voc->name);
     }
diff --git a/modules/taxonomy/views_handler_filter_term_node_tid.inc b/modules/taxonomy/views_handler_filter_term_node_tid.inc
index 7eb868f79ed0499a8b065145f229f8b028ebb3ab..e0dd0f9dd315f782461c55b317326d7e8584d9cc 100644
--- a/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -22,7 +22,7 @@ function init(&$view, &$options) {
 
     // Convert legacy vid option to machine name vocabulary.
     if (isset($this->options['vid']) && !empty($this->options['vid']) & empty($this->options['vocabulary'])) {
-      $vocabularies = taxonomy_get_vocabularies();
+      $vocabularies = taxonomy_vocabulary_get_names();
       $vid = $this->options['vid'];
       if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
         $this->options['vocabulary'] = $vocabularies[$vid]->machine_name;
@@ -47,7 +47,7 @@ function option_definition() {
   }
 
   function extra_options_form(&$form, &$form_state) {
-    $vocabularies = taxonomy_get_vocabularies();
+    $vocabularies = taxonomy_vocabulary_get_names();
     $options = array();
     foreach ($vocabularies as $voc) {
       $options[$voc->machine_name] = check_plain($voc->name);
diff --git a/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc b/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
index 062450c70202d88934f32ae4d3302b1f8503ef6a..18754b2270f0f29a572b33bdae739bf479705a0c 100644
--- a/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
+++ b/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
@@ -17,7 +17,7 @@ function get_value_options() {
     }
 
     $this->value_options = array();
-    $vocabularies = taxonomy_get_vocabularies();
+    $vocabularies = taxonomy_vocabulary_get_names();
     foreach ($vocabularies as $voc) {
       $this->value_options[$voc->machine_name] = $voc->name;
     }
diff --git a/modules/taxonomy/views_handler_filter_vocabulary_vid.inc b/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
index 2759ee1ec5fc33e2b9dd1bade8048f4bb2389477..f2c4ccd3ab947e7ed15a83338374c21f5faa8451 100644
--- a/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
+++ b/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
@@ -17,7 +17,7 @@ function get_value_options() {
     }
 
     $this->value_options = array();
-    $vocabularies = taxonomy_get_vocabularies();
+    $vocabularies = taxonomy_vocabulary_get_names();
     foreach ($vocabularies as $voc) {
       $this->value_options[$voc->vid] = $voc->name;
     }
diff --git a/modules/taxonomy/views_handler_relationship_node_term_data.inc b/modules/taxonomy/views_handler_relationship_node_term_data.inc
index b684d1dd44463778becc012b66f8b6bcc9bfc7d1..bd3981e4d0d2aae119d37ef7b1bb45b3bb670618 100644
--- a/modules/taxonomy/views_handler_relationship_node_term_data.inc
+++ b/modules/taxonomy/views_handler_relationship_node_term_data.inc
@@ -16,7 +16,7 @@ function init(&$view, &$options) {
 
     // Convert legacy vids option to machine name vocabularies.
     if (!empty($this->options['vids'])) {
-      $vocabularies = taxonomy_get_vocabularies();
+      $vocabularies = taxonomy_vocabulary_get_names();
       foreach ($this->options['vids'] as $vid) {
         if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
           $this->options['vocabularies'][$vocabularies[$vid]->machine_name] = $vocabularies[$vid]->machine_name;
@@ -32,7 +32,7 @@ function option_definition() {
   }
 
   function options_form(&$form, &$form_state) {
-    $vocabularies = taxonomy_get_vocabularies();
+    $vocabularies = taxonomy_vocabulary_get_names();
     $options = array();
     foreach ($vocabularies as $voc) {
       $options[$voc->machine_name] = check_plain($voc->name);
diff --git a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
index 9c1d81f9cf4adb27996aeba176c227a87f2dec39..65d427bbc9a7d7ed713d942fd06fac31b29b3bf7 100644
--- a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
+++ b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
@@ -14,7 +14,7 @@ function init(&$view, &$argument, $options) {
 
     // Convert legacy vids option to machine name vocabularies.
     if (!empty($this->options['vids'])) {
-      $vocabularies = taxonomy_get_vocabularies();
+      $vocabularies = taxonomy_vocabulary_get_names();
       foreach ($this->options['vids'] as $vid) {
         if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
           $this->options['vocabularies'][$vocabularies[$vid]->machine_name] = $vocabularies[$vid]->machine_name;
@@ -58,7 +58,7 @@ function options_form(&$form, &$form_state) {
     );
 
     $options = array();
-    $vocabularies = taxonomy_get_vocabularies();
+    $vocabularies = taxonomy_vocabulary_get_names();
     foreach ($vocabularies as $voc) {
       $options[$voc->machine_name] = check_plain($voc->name);
     }
diff --git a/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc b/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
index 3a8819984df1b94bf286729a062e27391ad1cc10..a324a011704b84ec97569897e266593349d9824d 100644
--- a/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
+++ b/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
@@ -14,7 +14,7 @@ function init(&$view, &$argument, $options) {
 
     // Convert legacy vids option to machine name vocabularies.
     if (!empty($this->options['vids'])) {
-      $vocabularies = taxonomy_get_vocabularies();
+      $vocabularies = taxonomy_vocabulary_get_names();
       foreach ($this->options['vids'] as $vid) {
         if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
           $this->options['vocabularies'][$vocabularies[$vid]->machine_name] = $vocabularies[$vid]->machine_name;
@@ -33,7 +33,7 @@ function option_definition() {
   }
 
   function options_form(&$form, &$form_state) {
-    $vocabularies = taxonomy_get_vocabularies();
+    $vocabularies = taxonomy_vocabulary_get_names();
     $options = array();
     foreach ($vocabularies as $voc) {
       $options[$voc->machine_name] = check_plain($voc->name);