diff --git entity.module entity.module
index 979cc6b..83da48f 100644
--- entity.module
+++ entity.module
@@ -752,7 +752,7 @@ function entity_metadata_wrapper($type, $data = NULL, array $info = array()) {
   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'])) {
@@ -776,7 +776,7 @@ function entity_metadata_wrapper($type, $data = NULL, array $info = array()) {
  * @see entity_metadata_system_entity_property_info()
  */
 function entity_metadata_site_wrapper() {
-  $site_info = entity_metadata_get_info('site');
+  $site_info = entity_get_property_info('site');
   $info['property info'] = $site_info['properties'];
   return entity_metadata_wrapper('site', FALSE, $info);
 }
diff --git entity.test entity.test
index c3c9fe9..87527ba 100644
--- entity.test
+++ entity.test
@@ -420,8 +420,8 @@ class EntityMetadataTestCase extends DrupalWebTestCase {
     $this->assertEqual($node->body[LANGUAGE_NONE][0]['value'], "<b>The second body.</b>", 'Update appears in the wrapped entity.');
     $this->assert(isset($node->body[LANGUAGE_NONE][0]['safe_value']), 'Formatted text has been processed.');
 
-    // Test iterator
-    $type_info = entity_metadata_get_info('node');
+    // Test iterator.
+    $type_info = entity_get_property_info('node');
     $this->assertFalse(array_diff_key($type_info['properties'], iterator_to_array($wrapper->getIterator())), 'Iterator is working.');
     foreach ($wrapper as $property) {
       $this->assertTrue($property instanceof EntityMetadataWrapper, 'Iterate over wrapper properties.');
@@ -505,13 +505,13 @@ class EntityMetadataTestCase extends DrupalWebTestCase {
   function testAccess() {
     // Test without data.
     $account = $this->drupalCreateUser(array('bypass node access'));
-    $this->assertTrue(entity_metadata_entity_access('view', 'node', NULL, $account), 'Access without data checked.');
+    $this->assertTrue(entity_access('view', 'node', NULL, $account), 'Access without data checked.');
 
     // Test with actual data.
     $values[LANGUAGE_NONE][0] = array('value' => '<b>2009-09-05</b>');
     $values[LANGUAGE_NONE][1] = array('value' => '2009-09-05');
     $node = $this->drupalCreateNode(array('type' => 'page', $this->field_name => $values));
-    $this->assertTrue(entity_metadata_entity_access('delete', 'node', $node, $account), 'Access with data checked.');
+    $this->assertTrue(entity_access('delete', 'node', $node, $account), 'Access with data checked.');
 
     // Test per property access without data.
     $account2 = $this->drupalCreateUser(array('bypass node access', 'administer nodes'));
@@ -551,17 +551,17 @@ class EntityMetadataTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Tests using entity_metadata_entity_query().
+   * Tests using entity_property_query().
    */
   function testEntityQuery() {
     $title = '<b>Is it bold?<b>';
     $values[LANGUAGE_NONE][0] = array('value' => 'foo');
     $node = $this->drupalCreateNode(array($this->field_name => $values, 'title' => $title));
 
-    $results = entity_metadata_entity_query('node', 'title', array($title, 'another title'));
+    $results = entity_property_query('node', 'title', array($title, 'another title'));
     $this->assertEqual($results, array($node->nid), 'Queried nodes with a given title.');
 
-    $results = entity_metadata_entity_query('node', $this->field_name, 'foo');
+    $results = entity_property_query('node', $this->field_name, 'foo');
     $this->assertEqual($results, array($node->nid), 'Queried nodes with a given field value.');
   }
 
@@ -734,15 +734,15 @@ class EntityMetadataIntegrationTestCase extends DrupalWebTestCase {
    */
   function testTaxonomyProperties() {
     $vocab = $this->createVocab();
-    $term_parent = entity_metadata_entity_create('taxonomy_term', array(
+    $term_parent = entity_property_values_create_entity('taxonomy_term', array(
       'name' => $this->randomName(),
       'vocabulary' => $vocab,
     ))->save()->value();
-    $term_parent2 = entity_metadata_entity_create('taxonomy_term', array(
+    $term_parent2 = entity_property_values_create_entity('taxonomy_term', array(
       'name' => $this->randomName(),
       'vocabulary' => $vocab,
     ))->save()->value();
-    $term = entity_metadata_entity_create('taxonomy_term', array(
+    $term = entity_property_values_create_entity('taxonomy_term', array(
       'name' => $this->randomName(),
       'vocabulary' => $vocab,
       'description' => $this->randomString(),
diff --git includes/entity.wrapper.inc includes/entity.wrapper.inc
index e0c7b39..84a1df7 100644
--- includes/entity.wrapper.inc
+++ includes/entity.wrapper.inc
@@ -126,7 +126,7 @@ abstract class EntityMetadataWrapper {
    * 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 @@ class EntityStructureWrapper extends EntityMetadataWrapper implements IteratorAg
 
   protected $propertyInfoDefaults = array(
     'type' => 'text',
-    'getter callback' => 'entity_metadata_verbatim_get',
+    'getter callback' => 'entity_property_verbatim_get',
     'clear' => array(),
   );
 
@@ -515,7 +515,7 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
   }
 
   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 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
   /**
    * 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 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
    */
   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 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
    */
   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 @@ class EntityListWrapper extends EntityMetadataWrapper implements IteratorAggrega
   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';
   }
 
diff --git modules/node.info.inc modules/node.info.inc
index 6c83e86..f345edf 100644
--- modules/node.info.inc
+++ modules/node.info.inc
@@ -37,7 +37,7 @@ function entity_metadata_node_entity_property_info() {
     'label' => t("Content type"),
     'type' => 'token',
     'description' => t("The type of the node."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'setter permission' => 'administer nodes',
     'options list' => 'node_type_get_names',
     'required' => TRUE,
@@ -46,14 +46,14 @@ function entity_metadata_node_entity_property_info() {
   $properties['title'] = array(
     'label' => t("Title"),
     'description' => t("The title of the node."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'query callback' => 'entity_metadata_table_query',
     'required' => TRUE,
   );
   $properties['language'] = array(
     'label' => t("Language"),
     'description' => t("The language the node is written in."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'options list' => 'entity_metadata_language_list',
     'query callback' => 'entity_metadata_table_query',
     'setter permission' => 'administer nodes',
@@ -73,7 +73,7 @@ function entity_metadata_node_entity_property_info() {
   $properties['status'] = array(
     'label' => t("Published"),
     'description' => t("Whether the node is published."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'setter permission' => 'administer nodes',
     'query callback' => 'entity_metadata_table_query',
     'type' => 'boolean',
@@ -81,7 +81,7 @@ function entity_metadata_node_entity_property_info() {
   $properties['promote'] = array(
     'label' => t("Promoted to frontpage"),
     'description' => t("Whether the node is promoted to the frontpage."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'setter permission' => 'administer nodes',
     'query callback' => 'entity_metadata_table_query',
     'type' => 'boolean',
@@ -89,7 +89,7 @@ function entity_metadata_node_entity_property_info() {
   $properties['sticky'] = array(
     'label' => t("Sticky in lists"),
     'description' => t("Whether the node is displayed at the top of lists in which it appears."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'setter permission' => 'administer nodes',
     'query callback' => 'entity_metadata_table_query',
     'type' => 'boolean',
@@ -98,7 +98,7 @@ function entity_metadata_node_entity_property_info() {
     'label' => t("Date created"),
     'type' => 'date',
     'description' => t("The date the node was posted."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'setter permission' => 'administer nodes',
     'query callback' => 'entity_metadata_table_query',
   );
@@ -127,14 +127,14 @@ function entity_metadata_node_entity_property_info() {
     'label' => t("Revision log message"),
     'type' => 'text',
     'description' => t("In case a new revision is to be saved, the log entry explaining the changes for this version."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'access callback' => 'entity_metadata_node_revision_access',
   );
   $properties['revision'] = array(
     'label' => t("Creates revision"),
     'type' => 'boolean',
     'description' => t("Whether saving this node creates a new revision."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'access callback' => 'entity_metadata_node_revision_access',
   );
   return $info;
diff --git modules/taxonomy.info.inc modules/taxonomy.info.inc
index ba12f2d..bcc476f 100644
--- modules/taxonomy.info.inc
+++ modules/taxonomy.info.inc
@@ -80,20 +80,20 @@ function entity_metadata_taxonomy_entity_property_info() {
   $properties['name'] = array(
     'label' => t("Name"),
     'description' => t("The name of the taxonomy vocabulary."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'required' => TRUE,
   );
   $properties['machine_name'] = array(
     'label' => t("Machine name"),
     'type' => 'token',
     'description' => t("The machine name of the taxonomy vocabulary."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'required' => TRUE,
   );
   $properties['description'] = array(
     'label' => t("Description"),
     'description' => t("The optional description of the taxonomy vocabulary."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'sanitize' => 'filter_xss',
   );
   $properties['term_count'] = array(
diff --git modules/user.info.inc modules/user.info.inc
index 50f893b..e357f8e 100644
--- modules/user.info.inc
+++ modules/user.info.inc
@@ -24,14 +24,14 @@ function entity_metadata_user_entity_property_info() {
     'label' => t("Name"),
     'description' => t("The login name of the user account."),
     'getter callback' => 'entity_metadata_user_get_properties',
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'sanitize' => 'filter_xss',
     'required' => TRUE,
   );
   $properties['mail'] = array(
     'label' => t("Email"),
     'description' => t("The email address of the user account."),
-    'setter callback' => 'entity_metadata_verbatim_set',
+    'setter callback' => 'entity_property_verbatim_set',
     'validation callback' => 'valid_email_address',
     'required' => TRUE,
   );