diff --git modules/comment/comment.module modules/comment/comment.module
index a2a7c15..f307236 100644
--- modules/comment/comment.module
+++ modules/comment/comment.module
@@ -98,6 +98,7 @@ function comment_entity_info() {
       'object keys' => array(
         'id' => 'cid',
         'bundle' => 'node_type',
+        'label' => 'subject',
       ),
       'bundle keys' => array(
         'bundle' => 'type',
diff --git modules/node/node.module modules/node/node.module
index c2d697b..814bde6 100644
--- modules/node/node.module
+++ modules/node/node.module
@@ -184,6 +184,7 @@ function node_entity_info() {
         'id' => 'nid',
         'revision' => 'vid',
         'bundle' => 'type',
+        'label' => 'title',
       ),
       'bundle keys' => array(
         'bundle' => 'type',
diff --git modules/system/system.api.php modules/system/system.api.php
index 9638185..6826ee2 100644
--- modules/system/system.api.php
+++ modules/system/system.api.php
@@ -113,20 +113,26 @@ function hook_hook_info() {
 function hook_entity_info() {
   $return = array(
     'node' => array(
-      'name' => t('Node'),
+      'label' => t('Node'),
       'controller class' => 'NodeController',
       'base table' => 'node',
-      'id key' => 'nid',
-      'revision key' => 'vid',
+      'revision table' => 'node_revision',
       'fieldable' => TRUE,
-      'bundle key' => 'type',
+      'object keys' => array(
+        'id' => 'nid',
+        'revision' => 'vid',
+        'bundle' => 'type',
+        'label' => 'title',
+      ),
+      'bundle keys' => array(
+        'bundle' => 'type',
+      ),
       // Node.module handles its own caching.
       // 'cacheable' => FALSE,
-      // Bundles must provide human readable name so
-      // we can create help and error messages about them.
-      'bundles' => node_type_get_names(),
+      'bundles' => array(),
     ),
   );
+
   return $return;
 }
 
diff --git modules/system/system.module modules/system/system.module
index 5237ab3..fc1fd9a 100644
--- modules/system/system.module
+++ modules/system/system.module
@@ -281,6 +281,7 @@ function system_entity_info() {
       'base table' => 'file',
       'object keys' => array(
         'id' => 'fid',
+        'label' => 'filename',
       ),
       'static cache' => FALSE,
     ),
diff --git modules/taxonomy/taxonomy.module modules/taxonomy/taxonomy.module
index 3184372..3cb6a26 100644
--- modules/taxonomy/taxonomy.module
+++ modules/taxonomy/taxonomy.module
@@ -46,6 +46,7 @@ function taxonomy_entity_info() {
       'object keys' => array(
         'id' => 'tid',
         'bundle' => 'vocabulary_machine_name',
+        'label' => 'name',
       ),
       'bundle keys' => array(
         'bundle' => 'machine_name',
diff --git modules/user/user.module modules/user/user.module
index cf2035d..05d3357 100644
--- modules/user/user.module
+++ modules/user/user.module
@@ -91,6 +91,7 @@ function user_entity_info() {
       'fieldable' => TRUE,
       'object keys' => array(
         'id' => 'uid',
+        'label' => 'name',
       ),
       'bundles' => array(
         'user' => array(