Index: includes/entity.wrapper.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/entity/includes/Attic/entity.wrapper.inc,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 entity.wrapper.inc
--- includes/entity.wrapper.inc	16 Dec 2010 11:13:26 -0000	1.1.2.1
+++ includes/entity.wrapper.inc	17 Dec 2010 12:15:43 -0000
@@ -126,7 +126,7 @@
    * Returns whether $value is a valid value to set.
    */
   public function validate($value) {
-    if (!entity_metadata_verify_data_type($value, $this->type)) {
+    if (!entity_property_verify_data_type($value, $this->type)) {
       return FALSE;
     }
     return !isset($this->info['validation callback']) || call_user_func($this->info['validation callback'], $value);
@@ -233,7 +233,7 @@
 
   protected $propertyInfoDefaults = array(
     'type' => 'text',
-    'getter callback' => 'entity_metadata_verbatim_get',
+    'getter callback' => 'entity_property_verbatim_get',
     'clear' => array(),
   );
 
@@ -515,7 +515,7 @@
   }
 
   protected function setUp() {
-    $this->propertyInfo = entity_metadata_get_info($this->type) + array('properties' => array());
+    $this->propertyInfo = entity_get_property_info($this->type) + array('properties' => array());
     $info = $this->info + array('property info' => array());
     $this->propertyInfo['properties'] += $info['property info'];
     $this->entityInfo = entity_get_info($this->type);
@@ -635,11 +635,11 @@
   /**
    * Checks whether the operation $op is allowed on the entity.
    *
-   * @see entity_metadata_entity_access()
+   * @see entity_access()
    */
   public function entityAccess($op, $account = NULL) {
     $entity = $this->dataAvailable() ? $this->value() : NULL;
-    return entity_metadata_entity_access($op, $this->type, $entity, $account);
+    return entity_access($op, $this->type, $entity, $account);
   }
 
   /**
@@ -649,7 +649,7 @@
    */
   public function save() {
     if ($this->data) {
-      $return = entity_metadata_entity_save($this->type, $this->data);
+      $return = entity_save($this->type, $this->data);
       if ($return === FALSE) {
         throw new EntityMetadataWrapperException("There is no information about how to save entities of type " . check_plain($this->type) . '.');
       }
@@ -669,7 +669,7 @@
    */
   public function delete() {
     if ($this->dataAvailable()) {
-      $return = entity_metadata_entity_delete($this->type, $this->id);
+      $return = entity_delete($this->type, $this->id);
       if ($return === FALSE) {
         throw new EntityMetadataWrapperException("There is no information about how to delete entities of type " . check_plain($this->type) . '.');
       }
@@ -731,7 +731,7 @@
   protected $data = NULL;
 
   protected function itemType() {
-    $type = entity_metadata_list_extract_type($this->type);
+    $type = entity_property_list_extract_type($this->type);
     return $type ? $type : 'unknown';
   }
 
Index: includes/entity.property.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/entity/includes/Attic/entity.property.inc,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 entity.property.inc
--- includes/entity.property.inc	16 Dec 2010 11:13:26 -0000	1.1.2.1
+++ includes/entity.property.inc	17 Dec 2010 12:15:43 -0000
@@ -61,12 +61,12 @@
     // Retrieve all known properties.
     $properties = array();
     foreach (entity_get_info() as $entity_type => $info) {
-      $properties += entity_metadata_get_properties($entity_type);
+      $properties += entity_get_all_property_info($entity_type);
     }
     return $properties;
   }
   // Else retrieve the properties of the given entity type only.
-  $info = entity_metadata_get_info($entity_type);
+  $info = entity_get_property_info($entity_type);
   $info += array('properties' => array(), 'bundles' => array());
   // Add all bundle properties.
   foreach ($info['bundles'] as $bundle => $bundle_info) {
@@ -228,7 +228,7 @@
  *   there were no information how to create the entity.
  */
 function entity_property_values_create_entity($entity_type, $values = array()) {
-  if (entity_metadata_entity_type_supports($entity_type, 'create')) {
+  if (entity_type_supports($entity_type, 'create')) {
     $info = entity_get_info($entity_type);
     // Create the initial entity.
     $entity = entity_create($entity_type, array_intersect_key($values, array_flip($info['entity keys'])));
Index: entity.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/entity/Attic/entity.module,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 entity.module
--- entity.module	16 Dec 2010 11:13:26 -0000	1.1.2.1
+++ entity.module	17 Dec 2010 12:15:43 -0000
@@ -752,7 +752,7 @@
   if (($entity_info = entity_get_info()) && isset($entity_info[$type])) {
     return new EntityDrupalWrapper($type, $data, $info);
   }
-  elseif ($type == 'list' || entity_metadata_list_extract_type($type)) {
+  elseif ($type == 'list' || entity_property_list_extract_type($type)) {
     return new EntityListWrapper($type, $data, $info);
   }
   elseif (isset($info['property info'])) {