diff --git Solr_Base_Query.php Solr_Base_Query.php
index a086d78..d9e472f 100644
--- Solr_Base_Query.php
+++ Solr_Base_Query.php
@@ -3,7 +3,7 @@
 class SolrBaseQuery implements DrupalSolrQueryInterface {
 
   /**
-   * Extract all uses of one named field from a filter string e.g. 'type:book'
+   * Extract all uses of one named field from a filter string e.g. 'entity_type:book'
    */
   public function filter_extract(&$filterstring, $name) {
     $extracted = array();
@@ -80,7 +80,7 @@ class SolrBaseQuery implements DrupalSolrQueryInterface {
   /**
    * A keyed array where the key is a position integer and the value
    * is an array with #name and #value properties.  Each value is a
-   * used for filter queries, e.g. array('#name' => 'uid', '#value' => 0)
+   * used for filter queries, e.g. array('#name' => 'is_uid', '#value' => 0)
    * for anonymous content.
    */
   protected $fields = array();
@@ -90,7 +90,7 @@ class SolrBaseQuery implements DrupalSolrQueryInterface {
   /**
    * The complete filter string for a query.  Usually from $_GET['filters']
    * Contains name:value pairs for filter queries.  For example,
-   * "type:book" for book nodes.
+   * "entity_type:book" for book nodes.
    */
   protected $filterstring;
 
@@ -299,7 +299,7 @@ class SolrBaseQuery implements DrupalSolrQueryInterface {
     // The array keys must always be real Solr index fields.
     return array(
       'score' => array('title' => t('Relevancy'), 'default' => 'desc'),
-      'sort_title' => array('title' => t('Title'), 'default' => 'asc'),
+      'sort_label' => array('title' => t('Title'), 'default' => 'asc'),
       'bundle' => array('title' => t('Type'), 'default' => 'asc'),
       'sort_name' => array('title' => t('Author'), 'default' => 'asc'),
       'ds_created' => array('title' => t('Date'), 'default' => 'desc'),
diff --git apachesolr.admin.inc apachesolr.admin.inc
index c0b4b3e..f52c6e2 100644
--- apachesolr.admin.inc
+++ apachesolr.admin.inc
@@ -657,7 +657,7 @@ function apachesolr_delete_index($type = NULL) {
   // Instantiate a new Solr object.
   $solr = apachesolr_get_solr();
   if ($type) {
-    $query = 'type:' . $type;
+    $query = 'entity_type:' . $type;
   }
   else {
     $query = '*:*';
@@ -859,10 +859,10 @@ function apachesolr_mlt_block_form($delta = NULL) {
   $form['restrictions']['mlt_custom_filters'] = array(
     '#type' => 'textfield',
     '#title' => t('Additional Query'),
-    '#description' => t('An additional query, in Lucene syntax, which will further filter the similarity suggestions. Ex. \'title:strategy\' will filter related content further to only those with strategy in the title. ' .
+    '#description' => t('An additional query, in Lucene syntax, which will further filter the similarity suggestions. Ex. \'label:strategy\' will filter related content further to only those with strategy in the title. ' .
                         'Likewise \'content:HDTV^3\' will boost the term HDTV by a factor of 3. Here are some more examples:' .
                         '<ul>
-                            <li>language:fr</li>
+                            <li>ss_language:fr</li>
                             <li>tid:5 OR tid 7</li>
                             <li>ds_created:[2009-05-01T23:59:59Z TO 2009-07-28T12:30:00Z]</li>
                             <li>-is_uid:0 AND -is_uid:1</li>
diff --git apachesolr.api.php apachesolr.api.php
index 7364cd3..d008d42 100644
--- apachesolr.api.php
+++ apachesolr.api.php
@@ -13,7 +13,7 @@
   */
 function hook_apachesolr_modify_query($query, $caller) {
   // I only want to see articles by the admin!
-  $query->add_filter("uid", 1);
+  $query->add_filter("is_uid", 1);
 }
 
 /**
@@ -32,7 +32,7 @@ function CALLER_finalize_query($query) {
  */
 function hook_apachesolr_prepare_query($query, $caller) {
   // Add a sort on the node ID.
-  $query->set_available_sort('nid', array(
+  $query->set_available_sort('entity_id', array(
     'title' => t('Node ID'),
     'default' => 'asc',
   ));
diff --git apachesolr.module apachesolr.module
index dd31702..6842d86 100644
--- apachesolr.module
+++ apachesolr.module
@@ -525,7 +525,7 @@ function apachesolr_index_nodes($rows, $namespace) {
       $nids = array();
       if (!empty($docs)) {
         foreach ($docs as $doc) {
-          $nids[] = $doc->nid;
+          $nids[] = $doc->entity_id;
         }
       }
       watchdog('Apache Solr', 'Indexing failed on one of the following nodes: @nids <br /> !message', array(
@@ -944,7 +944,7 @@ function apachesolr_block_visibility(DrupalSolrQueryInterface $query, $module, $
       $has_filter = $query->get_filters($facet_info[$module][$delta]['facet_field']);
       $show = count($has_filter);
       foreach ($facet_info[$module][$delta]['content_types'] as $content_type) {
-        if ($query->has_filter('type', $content_type)) {
+        if ($query->has_filter('entity_type', $content_type)) {
           $show = TRUE;
         }
       }
@@ -1589,7 +1589,7 @@ function apachesolr_facetcount_save($edit) {
  *
  * function my_module_apachesolr_modify_query($query, $caller) {
  *   // I only want to see articles by the admin!
- *   $query->add_filter("uid", 1);
+ *   $query->add_filter("is_uid", 1);
  *
  * }
  *
@@ -2439,7 +2439,7 @@ function apachesolr_mlt_suggestions($settings, $id, $solr = NULL) {
     $type_filters = array();
     if (is_array($settings['mlt_type_filters'])) {
       foreach ($settings['mlt_type_filters'] as $type_filter) {
-        $type_filters[] = "type:{$type_filter}";
+        $type_filters[] = "entity_type:{$type_filter}";
       }
       $query->params['fq']['mlt'][] = '(' . implode(' OR ', $type_filters) . ') ';
     }
diff --git apachesolr_search.admin.inc apachesolr_search.admin.inc
index 3051a3d..97bb4ab 100644
--- apachesolr_search.admin.inc
+++ apachesolr_search.admin.inc
@@ -240,7 +240,7 @@ function apachesolr_search_type_boost_form_submit($form, &$form_state) {
     if (!empty($new_excluded_types[$type])) {
       try {
         $solr = apachesolr_get_solr($form['#server_id']);
-        $solr->deleteByQuery("type:$type");
+        $solr->deleteByQuery("entity_type:$type");
         apachesolr_index_set_last_updated(REQUEST_TIME);
       }
       catch (Exception $e) {
diff --git apachesolr_search.module apachesolr_search.module
index ee7fa7f..73abbec 100644
--- apachesolr_search.module
+++ apachesolr_search.module
@@ -699,7 +699,7 @@ function apachesolr_search_node_result($doc, &$result, &$extra) {
   $result += array(
     'type' => apachesolr_search_get_type($doc->bundle),
     'user' => theme('username', array('account' => $doc)),
-    'date' => isset($doc->created) ? $doc->created : 0,
+    'date' => isset($doc->ds_created) ? $doc->ds_created : 0,
     'node' => $doc,
     'uid' => $doc->is_uid,
   );
@@ -1606,9 +1606,9 @@ function theme_apachesolr_search_snippets($vars) {
   $result = '';
   if (is_array($vars['snippets'])) {
     $snippets = $vars['snippets'];
-    if (isset($snippets['body'])) {
-      $result .= $snippets['body'];
-      unset($snippets['body']);
+    if (isset($snippets['content'])) {
+      $result .= $snippets['content'];
+      unset($snippets['content']);
     }
     if (isset($snippets['teaser'])) {
       $result .= (strlen($result) > 0) ? ' ... ' : '';
diff --git drush/apachesolr.drush.inc drush/apachesolr.drush.inc
index 505239f..2139252 100644
--- drush/apachesolr.drush.inc
+++ drush/apachesolr.drush.inc
@@ -155,7 +155,7 @@ function apachesolr_drush_solr_search() {
   $args = func_get_args();
   $keys = implode(' ', $args);
   foreach (apachesolr_search_execute($keys, '', '') as $result) {
-    $output = 'node/' . $result['node']->nid . ' ' . dt('by @name (user/@uid)', array('@name' => strip_tags($result['user']), '@uid' => $result['node']->uid)) . "\n";
+    $output = 'node/' . $result['node']->entity_id . ' ' . dt('by @name (user/@uid)', array('@name' => strip_tags($result['user']), '@uid' => $result['node']->uid)) . "\n";
     $output .= dt('title: ') . $result['title'] . "\n";
     $output .= preg_replace('/[\s]+/', ' ', strip_tags($result['snippet'])) . "\n\n";
     drush_print($output);
diff --git solrconfig.xml solrconfig.xml
index 10e87fb..37b7913 100644
--- solrconfig.xml
+++ solrconfig.xml
@@ -476,13 +476,13 @@
      <str name="hl.mergeContiguous">true</str>
    <!-- instructs Solr to return the field itself if no query terms are
         found -->
-     <str name="f.body.hl.alternateField">teaser</str>
-     <str name="f.body.hl.maxAlternateFieldLength">256</str>
+     <str name="f.content.hl.alternateField">teaser</str>
+     <str name="f.content.hl.maxAlternateFieldLength">256</str>
      <!-- JS: I wasn't getting good results here... I'm turning off for now
      because I was getting periods (.) by themselves at the beginning of
      snippets and don't feel like debugging anymore.  Without the regex is
      faster too -->
-     <!--<str name="f.body.hl.fragmenter">regex</str>--> <!-- defined below -->
+     <!--<str name="f.content.hl.fragmenter">regex</str>--> <!-- defined below -->
 
     <!-- By default, don't spell check -->
       <str name="spellcheck">false</str>
diff --git tests/solr_base_query.test tests/solr_base_query.test
index 3c51c6e..ddbb8d7 100644
--- tests/solr_base_query.test
+++ tests/solr_base_query.test
@@ -3,12 +3,12 @@
 class DummySolr {
   function getFields() {
     return (object) array(
-       'uid' =>
+       'is_uid' =>
       (object) array(
          'type' => 'long',
          'schema' => 'I-S----OF-----',
       ),
-       'body' =>
+       'content' =>
       (object) array(
          'type' => 'text',
          'schema' => 'ITS-V---------',
@@ -19,12 +19,12 @@ class DummySolr {
          'schema' => 'I-SM---OF-----',
          'dynamicBase' => 'im_*',
       ),
-       'entity' =>
+       'entity_type' =>
       (object) array(
          'type' => 'string',
          'schema' => 'I-S----OF----l',
       ),
-       'last_comment_or_change' =>
+       'ds_last_comment_or_change' =>
       (object) array(
          'type' => 'tdate',
          'schema' => 'ITS----OF-----',
@@ -35,22 +35,12 @@ class DummySolr {
          'schema' => 'I--M---OF-----',
          'dynamicBase' => 'nodeaccess*',
       ),
-       'type' =>
-      (object) array(
-         'type' => 'string',
-         'schema' => 'I-S----OF----l',
-      ),
        'entity_id' =>
       (object) array(
          'type' => 'tlong',
          'schema' => 'ITS----OF-----',
       ),
-       'sname' =>
-      (object) array(
-         'type' => 'string',
-         'schema' => 'I------OF----l',
-      ),
-       'changed' =>
+       'ds_changed' =>
       (object) array(
          'type' => 'tdate',
          'schema' => 'ITS----OF-----',
@@ -65,7 +55,7 @@ class DummySolr {
          'type' => 'date',
          'schema' => 'I-S----OF----l',
       ),
-       'title' =>
+       'label' =>
       (object) array(
          'type' => 'text',
          'schema' => 'ITS-V--O------',
@@ -76,12 +66,12 @@ class DummySolr {
          'schema' => 'I--M---OF-----',
          'dynamicBase' => 'nodeaccess*',
       ),
-       'created' =>
+       'ds_created' =>
       (object) array(
          'type' => 'tdate',
          'schema' => 'ITS----OF-----',
       ),
-       'name' =>
+       'ss_name' =>
       (object) array(
          'type' => 'text',
          'schema' => 'ITS-V---------',
@@ -106,7 +96,7 @@ class DummySolr {
          'type' => 'long',
          'schema' => 'I-SM---OF-----',
       ),
-       'tnid' =>
+       'is_tnid' =>
       (object) array(
          'type' => 'long',
          'schema' => 'I-S----OF-----',
@@ -133,7 +123,7 @@ class DummySolr {
          'type' => 'string',
          'schema' => 'I-S----OF----l',
       ),
-       'comment_count' =>
+       'is_comment_count' =>
       (object) array(
          'type' => 'tint',
          'schema' => 'ITS----OF-----',
@@ -148,12 +138,12 @@ class DummySolr {
          'type' => 'string',
          'schema' => 'I-S----OF----l',
       ),
-       'status' =>
+       'bs_status' =>
       (object) array(
          'type' => 'boolean',
          'schema' => 'I-S----OF----l',
       ),
-       'nid' =>
+       'entity_id' =>
       (object) array(
          'type' => 'long',
          'schema' => 'I-S----OF-----',
@@ -180,12 +170,12 @@ class DummySolr {
          'schema' => 'IT-----O------',
          'dynamicBase' => 'tags_*',
       ),
-       'sticky' =>
+       'bs_sticky' =>
       (object) array(
          'type' => 'boolean',
          'schema' => 'I-S----OF----l',
       ),
-       'promote' =>
+       'bs_promote' =>
       (object) array(
          'type' => 'boolean',
          'schema' => 'I-S----OF----l',
@@ -195,28 +185,23 @@ class DummySolr {
          'type' => 'text',
          'schema' => '-TS-----------',
       ),
-       'type_name' =>
-      (object) array(
-         'type' => 'string',
-         'schema' => 'I-S----OF----l',
-      ),
        'im_vid_1' =>
       (object) array(
          'type' => 'long',
          'schema' => 'I-SM---OF-----',
          'dynamicBase' => 'im_*',
       ),
-       'translate' =>
+       'bs_translate' =>
       (object) array(
          'type' => 'boolean',
          'schema' => 'I-S----OF----l',
       ),
-       'sort_title' =>
+       'sort_label' =>
       (object) array(
          'type' => 'sortString',
          'schema' => 'IT-----O-----l',
       ),
-       'language' =>
+       'ss_language' =>
       (object) array(
          'type' => 'string',
          'schema' => 'I-S----OF----l',
@@ -254,11 +239,11 @@ class SolrBaseQueryTests extends DrupalUnitTestCase {
    * Regression test for http://drupal.org/node/891962
    */
   function testParseFilters() {
-    $filterstring = 'tid:3 sort_title:hello tid:11 tid:1 tid:12 title:hello';
+    $filterstring = 'tid:3 sort_label:hello tid:11 tid:1 tid:12 label:hello';
     // Setup dummy Solr object.
     $query = new SolrBaseQuery(new DummySolr(), 'mykeys', $filterstring, '', '');
-    $this->assertFalse($query->has_filter('title', 'Hello'));
-    $this->assertTrue($query->has_filter('title', 'hello'));
+    $this->assertFalse($query->has_filter('label', 'Hello'));
+    $this->assertTrue($query->has_filter('label', 'hello'));
     $filters = $query->get_filters();
     $this->assertEqual(count($filters), 6, count($filters) . ' filters found, expected 6 filters');
     // Check positions of filters
@@ -272,11 +257,11 @@ class SolrBaseQueryTests extends DrupalUnitTestCase {
     $query->remove_filter('tid', '11');
     $filters = $query->get_filters();
     $this->assertEqual(count($filters), 5, count($filters) . ' filters found, expected 5 filters');
-    $this->assertEqual(array('filters' => 'tid:3 sort_title:hello tid:1 tid:12 title:hello'), $query->get_url_queryvalues());
+    $this->assertEqual(array('filters' => 'tid:3 sort_label:hello tid:1 tid:12 label:hello'), $query->get_url_queryvalues());
     $query->remove_filter('tid');
     $filters = $query->get_filters();
     $this->assertEqual(count($filters), 2, count($filters) . ' filters found, expected 2 filters');
-    $this->assertEqual(array('filters' => 'sort_title:hello title:hello'), $query->get_url_queryvalues());
+    $this->assertEqual(array('filters' => 'sort_label:hello label:hello'), $query->get_url_queryvalues());
   }
 }
 
diff --git tests/solr_base_subquery.test tests/solr_base_subquery.test
index 9df6346..81de9a3 100644
--- tests/solr_base_subquery.test
+++ tests/solr_base_subquery.test
@@ -37,22 +37,22 @@ class DrupalSolrSubQueryTests extends DrupalWebTestCase {
   }
 
   function testSubQueriesFilter() {
-    $query1 = apachesolr_drupal_query('', 'uid:1 tid:5');
-    $query2 = apachesolr_drupal_query('', 'uid:10');
-    $query3 = apachesolr_drupal_query('', 'uid:2');
-    $query4 = apachesolr_drupal_query('', 'title:baz');
+    $query1 = apachesolr_drupal_query('', 'is_uid:1 tid:5');
+    $query2 = apachesolr_drupal_query('', 'is_uid:10');
+    $query3 = apachesolr_drupal_query('', 'is_uid:2');
+    $query4 = apachesolr_drupal_query('', 'label:baz');
 
     $query2->add_subquery($query1, 'OR');
     $queryvalues = $query2->get_url_queryvalues();
-    $this->assertEqual($queryvalues, array('filters' => 'uid:10 (uid:1 OR tid:5)'));
+    $this->assertEqual($queryvalues, array('filters' => 'is_uid:10 (is_uid:1 OR tid:5)'));
 
     $query3->add_subquery($query1, 'AND');
     $query3->add_subquery($query4);
     $queryvalues = $query3->get_url_queryvalues();
-    $this->assertEqual($queryvalues, array('filters' => 'uid:2 (uid:1 AND tid:5)'));
+    $this->assertEqual($queryvalues, array('filters' => 'is_uid:2 (is_uid:1 AND tid:5)'));
 
     $query3->remove_subquery($query1);
     $queryvalues = $query3->get_url_queryvalues();
-    $this->assertEqual($queryvalues, array('filters' => 'uid:2 (title:baz)'));
+    $this->assertEqual($queryvalues, array('filters' => 'is_uid:2 (label:baz)'));
   }
 }
diff --git tests/solr_index_and_search.test tests/solr_index_and_search.test
index 29d7191..387b672 100755
--- tests/solr_index_and_search.test
+++ tests/solr_index_and_search.test
@@ -105,7 +105,7 @@ class DrupalSolrMatchTestCase extends DrupalSolrWebTestCase {
 
     variable_set('minimum_word_size', 3);
     for ($i = 1; $i <= 7; ++$i) {
-      $documents[] = $this->_solr_build_document($i, array('nid' => $i, 'text' => $this->getText($i)));
+      $documents[] = $this->_solr_build_document($i, array('entity_id' => $i, 'content' => $this->getText($i)));
     }
 
     $this->_solr_index($documents);
@@ -223,7 +223,7 @@ class DrupalSolrMatchTestCase extends DrupalSolrWebTestCase {
     // Get result IDs.
     $found = array();
     foreach ($set as $item) {
-      $found[] = $item->nid;
+      $found[] = $item->entity_id;
     }
     // Compare $results and $found.
     sort($found);