diff --git a/Solr/5/templates/schema.ss b/Solr/5/templates/schema.ss
index d07fe627..345d1ff9 100644
--- a/Solr/5/templates/schema.ss
+++ b/Solr/5/templates/schema.ss
@@ -52,8 +52,8 @@
     <fields>
         <%-- Default fields, needed for all items --%>
         <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='ObjectID' type='tint' indexed='true' stored='true' required='true' multiValued='false'/>
+        <field name='ClassName' type='string' indexed='true' stored='true' required='true' multiValued='false'/>
         <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'/>
         <% loop $CopyFields %>
diff --git a/src/Factories/DocumentFactory.php b/src/Factories/DocumentFactory.php
index 53202743..cf22a887 100644
--- a/src/Factories/DocumentFactory.php
+++ b/src/Factories/DocumentFactory.php
@@ -101,7 +101,7 @@ public function buildItems($class, $fields, $index, $update, $group, &$count = 0
     protected function addDefaultFields(Document $doc, DataObject $item)
     {
         $doc->setKey('id', $item->ClassName . '-' . $item->ID);
-        $doc->addField('ID', $item->ID);
+        $doc->addField('ObjectID', $item->ID);
         $doc->addField('ClassName', $item->ClassName);
         $doc->addField('ClassHierarchy', ClassInfo::ancestry($item));
         $doc->addField('ViewStatus', $item->getViewStatus());