diff --git a/entity.module b/entity.module
index 432d469..d05cced 100644
--- a/entity.module
+++ b/entity.module
@@ -978,5 +978,7 @@ function entity_entity_info_alter(&$entity_info) {
     // Token type mapping.
     $entity_info['taxonomy_term']['token type'] = 'term';
     $entity_info['taxonomy_vocabulary']['token type'] = 'vocabulary';
+    // Machine name handling.
+    $entity_info['taxonomy_vocabulary']['entity keys']['name'] = 'machine_name';
   }
 }