diff --git similarterms.module similarterms.module
index 990a307..953adbd 100644
--- similarterms.module
+++ similarterms.module
@@ -51,7 +51,7 @@ function similarterms_block_info() {
     'cache' => DRUPAL_CACHE_PER_ROLE | DRUPAL_CACHE_PER_PAGE,
   );
   foreach (taxonomy_get_vocabularies() as $v) {
-    $blocks[$v->vid] = array(
+    $blocks[$v->machine_name] = array(
       'info' => t('Similar entries from the @vocab vocabulary.', array('@vocab' => $v->name)),
       'cache' => DRUPAL_CACHE_PER_ROLE | DRUPAL_CACHE_PER_PAGE
     );
@@ -63,7 +63,10 @@ function similarterms_block_info() {
  * Implements hook_block_view().
  */
 function similarterms_block_view($delta = '') {
-  $vocid = $delta ? $delta : 'all';
+  $vocid = $delta;
+  if ($delta != 'all' && $vocab = taxonomy_vocabulary_machine_name_load($delta)) {
+    $vocid = $vocab->vid;
+  }
   $block = array(
     'subject' => t('Similar'),
     'content' => theme('similarterms', array(
@@ -107,9 +110,9 @@ function similarterms_block_configure($delta = '') {
     '#multiple' => TRUE
   );
   if ($delta != 'all') {
+    $vocab = $vocab = taxonomy_vocabulary_machine_name_load($delta);
     $terms = array();
-    $tree = ($delta);
-    foreach ($tree as $term) {
+    foreach (taxonomy_term_load_multiple(FALSE, array('vid' => $vocab->vid)) as $term) {
       $terms[$term->tid] = $term->name;
     }
     $form['ignoreterms'] = array(