diff --git a/Solr/5/extras/elevate.xml b/Solr/5/extras/elevate.xml
index d0d6a4e3..0e934fdd 100644
--- a/Solr/5/extras/elevate.xml
+++ b/Solr/5/extras/elevate.xml
@@ -23,14 +23,14 @@
 
 <elevate>
     <query text="foo bar">
-        <doc id="1"/>
-        <doc id="2"/>
-        <doc id="3"/>
+        <doc id="Page-1"/>
+        <doc id="Page-2"/>
+        <doc id="Page-3"/>
     </query>
 
     <query text="ipod">
-        <doc id="MA147LL/A"/>  <!-- put the actual ipod at the top -->
-        <doc id="IW-02" exclude="true"/> <!-- exclude this cable -->
+        <doc id="Page-3"/>  <!-- put Page with ID = 3 at the top -->
+        <doc id="Page-2" exclude="true"/> <!-- exclude Page ID 2 -->
     </query>
 
 </elevate>
diff --git a/Solr/5/extras/solrconfig.xml b/Solr/5/extras/solrconfig.xml
index b01b3db7..4386de28 100644
--- a/Solr/5/extras/solrconfig.xml
+++ b/Solr/5/extras/solrconfig.xml
@@ -810,7 +810,7 @@
         <lst name="defaults">
             <str name="echoParams">explicit</str>
             <int name="rows">10</int>
-            <str name="df">_text</str>
+            <str name="df">text</str>
         </lst>
         <!-- In addition to defaults, "appends" params can be specified
              to identify values which should be appended to the list of
@@ -876,7 +876,7 @@
             <str name="echoParams">explicit</str>
             <str name="wt">json</str>
             <str name="indent">true</str>
-            <str name="df">_text</str>
+            <str name="df">text</str>
         </lst>
     </requestHandler>
 
@@ -918,7 +918,7 @@
                 text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
                 title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
             </str>
-            <str name="df">_text</str>
+            <str name="df">text</str>
             <str name="mm">100%</str>
             <str name="q.alt">*:*</str>
             <str name="rows">10</str>
@@ -1258,7 +1258,7 @@
         <!-- a spellchecker built from a field of the main index -->
         <lst name="spellchecker">
             <str name="name">default</str>
-            <str name="field">_text</str>
+            <str name="field">text</str>
             <str name="classname">solr.DirectSolrSpellChecker</str>
             <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
             <str name="distanceMeasure">internal</str>
@@ -1307,7 +1307,7 @@
         <lst name="spellchecker">
             <str name="name">wordbreak</str>
             <str name="classname">solr.WordBreakSolrSpellChecker</str>
-            <str name="field">_text</str>
+            <str name="field">text</str>
             <str name="combineWords">true</str>
             <str name="breakWords">true</str>
             <int name="maxChanges">10</int>
@@ -1367,7 +1367,7 @@
       -->
     <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
         <lst name="defaults">
-            <str name="df">_text</str>
+            <str name="df">text</str>
             <!-- Solr will use suggestions from both the 'default' spellchecker
                  and from the 'wordbreak' spellchecker and combine them.
                  collations (re-written queries) can include a combination of
@@ -1404,7 +1404,7 @@
       -->
     <requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
         <lst name="defaults">
-            <str name="df">_text</str>
+            <str name="df">text</str>
             <bool name="tv">true</bool>
         </lst>
         <arr name="last-components">
@@ -1551,7 +1551,7 @@
       -->
     <searchComponent name="elevator" class="solr.QueryElevationComponent">
         <!-- pick a fieldType to analyze queries -->
-        <str name="queryFieldType">string</str>
+        <str name="queryFieldType">text</str>
         <str name="config-file">elevate.xml</str>
     </searchComponent>
 
diff --git a/Solr/5/templates/schema.ss b/Solr/5/templates/schema.ss
index e62ac030..d07fe627 100644
--- a/Solr/5/templates/schema.ss
+++ b/Solr/5/templates/schema.ss
@@ -51,8 +51,8 @@
 
     <fields>
         <%-- Default fields, needed for all items --%>
-        <field name='_documentid' type='string' indexed='true' stored='true' required='true'/>
-        <field name='ID' type='tint' indexed='true' stored='true' required='true'/>
+        <field name='id' type='string' indexed='true' stored='true' required='true' multiValued='false'/>
+        <field name='ID' type='tint' indexed='true' stored='true' required='true' multiValued='false'/>
         <field name='ClassName' type='string' indexed='true' stored='true' required='true'/>
         <field name='ClassHierarchy' type='string' indexed='true' stored='true' required='true' multiValued='true'/>
         <field name='ViewStatus' type='string' indexed='true' stored='true' required='true' multiValued='true'/>
@@ -62,11 +62,9 @@
         <% loop $FulltextFieldDefinitions %>
             <field name='$Field' type='$Type' indexed='$Indexed' stored='$Stored' multiValued='$MultiValued'/>
         <% end_loop %>
-
         <% loop $FilterFieldDefinitions %>
             <field name='$Field' type='$Type' indexed='$Indexed' stored='$Stored' multiValued='$MultiValued'/>
         <% end_loop %>
-
         <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
     </fields>
 
@@ -74,7 +72,7 @@
         <copyField source='$Field' dest='$Destination'/>
     <% end_loop %>
 
-    <uniqueKey>_documentid</uniqueKey>
+    <uniqueKey>id</uniqueKey>
 
     <df>$DefaultField</df>
 
diff --git a/src/Factories/DocumentFactory.php b/src/Factories/DocumentFactory.php
index 634dfb33..53202743 100644
--- a/src/Factories/DocumentFactory.php
+++ b/src/Factories/DocumentFactory.php
@@ -100,7 +100,7 @@ public function buildItems($class, $fields, $index, $update, $group, &$count = 0
      */
     protected function addDefaultFields(Document $doc, DataObject $item)
     {
-        $doc->setKey('_documentid', $item->ClassName . '-' . $item->ID);
+        $doc->setKey('id', $item->ClassName . '-' . $item->ID);
         $doc->addField('ID', $item->ID);
         $doc->addField('ClassName', $item->ClassName);
         $doc->addField('ClassHierarchy', ClassInfo::ancestry($item));
@@ -115,7 +115,7 @@ protected function addDefaultFields(Document $doc, DataObject $item)
     protected function addField($doc, $object, $field)
     {
         $typeMap = Statics::getTypeMap();
-        if (!$this->classIs($object, $field['origin'])) {
+        if (!$this->classIs(ClassInfo::shortName($object), $field['class'])) {
             return;
         }
 
diff --git a/src/Indexes/BaseIndex.php b/src/Indexes/BaseIndex.php
index 43a89a15..be0c87f0 100644
--- a/src/Indexes/BaseIndex.php
+++ b/src/Indexes/BaseIndex.php
@@ -65,14 +65,15 @@ abstract class BaseIndex
      * @var array
      */
     protected $copyFields = [
-        '_text' => [
+        'text' => [
             '*'
         ],
     ];
     /**
      * @var string
      */
-    protected $defaultField = '_text';
+    protected $defaultField = 'text';
+
     /**
      * @var SchemaService
      */