diff --git a/includes/common.inc b/includes/common.inc
index e75aa81..68701bc 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -7573,7 +7573,7 @@ function entity_uri($entity_type, $entity) {
   // the callback for the entity type or bundle would return, and it helps
   // minimize performance overhead when entity_uri() is called multiple times
   // for the same entity.
-  if (!isset($entity->uri)) {
+  if (!isset($entity->_entity_uri)) {
     $info = entity_get_info($entity_type);
     list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
 
@@ -7590,23 +7590,23 @@ function entity_uri($entity_type, $entity) {
     }
 
     // Invoke the callback to get the URI. If there is no callback, set the
-    // entity's 'uri' property to FALSE to indicate that it is known to not have
-    // a URI.
+    // entity's '_entity_uri' property to FALSE to indicate that it is known to
+    // not have a URI.
     if (isset($uri_callback) && function_exists($uri_callback)) {
-      $entity->uri = $uri_callback($entity);
-      if (!isset($entity->uri['options'])) {
-        $entity->uri['options'] = array();
+      $entity->_entity_uri = $uri_callback($entity);
+      if (!isset($entity->_entity_uri['options'])) {
+        $entity->_entity_uri['options'] = array();
       }
       // Pass the entity data to url() so that alter functions do not need to
       // lookup this entity again.
-      $entity->uri['options']['entity_type'] = $entity_type;
-      $entity->uri['options']['entity'] = $entity;
+      $entity->_entity_uri['options']['entity_type'] = $entity_type;
+      $entity->_entity_uri['options']['entity'] = $entity;
     }
     else {
-      $entity->uri = FALSE;
+      $entity->_entity_uri = FALSE;
     }
   }
-  return $entity->uri ? $entity->uri : NULL;
+  return $entity->_entity_uri ? $entity->_entity_uri : NULL;
 }
 
 /**