diff --git a/src/apps/SolrTest/conf/schema.xml b/src/apps/SolrTest/conf/schema.xml
index 6fbab1c9695..2f88f3b7619 100644
--- a/src/apps/SolrTest/conf/schema.xml
+++ b/src/apps/SolrTest/conf/schema.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
-<!-- The Solar schema file. This file should be named "schema.xml" and
-     should be located where the classloader for the Solar webapp can find it.
+<!-- The Solr schema file. This file should be named "schema.xml" and
+     should be located where the classloader for the Solr webapp can find it.
 
      $Id: schema.xml,v 1.1 2005/06/09 03:01:13 yonik Exp $
-     $Source: /cvs/main/searching/solar-configs/test/WEB-INF/classes/schema.xml,v $
+     $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $
      $Name:  $
   -->
 
@@ -21,10 +21,10 @@
          These are provided more for backward compatability, allowing one
          to create a schema that matches an existing lucene index.
     -->
-    <fieldtype name="integer" class="solar.IntField"/>
-    <fieldtype name="long" class="solar.LongField"/>
-    <fieldtype name="float" class="solar.FloatField"/>
-    <fieldtype name="double" class="solar.DoubleField"/>
+    <fieldtype name="integer" class="solr.IntField"/>
+    <fieldtype name="long" class="solr.LongField"/>
+    <fieldtype name="float" class="solr.FloatField"/>
+    <fieldtype name="double" class="solr.DoubleField"/>
 
     <!-- numeric field types that manipulate the value into
        a string value that isn't human readable in it's internal form,
@@ -40,197 +40,197 @@
        then default lucene sorting will be used which places docs without the field
        first in an ascending sort and last in a descending sort.
     -->
-    <fieldtype name="sint" class="solar.SortableIntField" sortMissingLast="true"/>
-    <fieldtype name="slong" class="solar.SortableLongField" sortMissingLast="true"/>
-    <fieldtype name="sfloat" class="solar.SortableFloatField" sortMissingLast="true"/>
-    <fieldtype name="sdouble" class="solar.SortableDoubleField" sortMissingLast="true"/>
+    <fieldtype name="sint" class="solr.SortableIntField" sortMissingLast="true"/>
+    <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true"/>
+    <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true"/>
+    <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true"/>
 
     <!-- bcd versions of sortable numeric type may provide smaller
          storage space and support very large numbers.
     -->
-    <fieldtype name="bcdint" class="solar.BCDIntField" sortMissingLast="true"/>
-    <fieldtype name="bcdlong" class="solar.BCDLongField" sortMissingLast="true"/>
-    <fieldtype name="bcdstr" class="solar.BCDStrField" sortMissingLast="true"/>
+    <fieldtype name="bcdint" class="solr.BCDIntField" sortMissingLast="true"/>
+    <fieldtype name="bcdlong" class="solr.BCDLongField" sortMissingLast="true"/>
+    <fieldtype name="bcdstr" class="solr.BCDStrField" sortMissingLast="true"/>
 
 
-    <fieldtype name="boolean" class="solar.BoolField" sortMissingLast="true"/>
-    <fieldtype name="string" class="solar.StrField" sortMissingLast="true"/>
+    <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+    <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
 
     <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
          seconds part (.999) is optional.
       -->
-    <fieldtype name="date" class="solar.DateField" sortMissingLast="true"/>
+    <fieldtype name="date" class="solr.DateField" sortMissingLast="true"/>
 
-    <!-- solar.TextField allows the specification of custom
+    <!-- solr.TextField allows the specification of custom
          text analyzers specified as a tokenizer and a list
          of token filters.
       -->
-    <fieldtype name="text" class="solar.TextField">
+    <fieldtype name="text" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.StandardTokenizerFactory"/>
-        <filter class="solar.StandardFilterFactory"/>
-        <filter class="solar.LowerCaseFilterFactory"/>
-        <filter class="solar.StopFilterFactory"/>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory"/>
         <!-- lucene PorterStemFilterFactory deprecated
-          <filter class="solar.PorterStemFilterFactory"/>
+          <filter class="solr.PorterStemFilterFactory"/>
         -->
-        <filter class="solar.EnglishPorterFilterFactory"/>
+        <filter class="solr.EnglishPorterFilterFactory"/>
       </analyzer>
     </fieldtype>
 
 
-    <fieldtype name="nametext" class="solar.TextField">
+    <fieldtype name="nametext" class="solr.TextField">
       <analyzer class="org.apache.lucene.analysis.WhitespaceAnalyzer"/>
     </fieldtype>
 
-    <fieldtype name="teststop" class="solar.TextField">
+    <fieldtype name="teststop" class="solr.TextField">
        <analyzer>
-        <tokenizer class="solar.LowerCaseTokenizerFactory"/>
-        <filter class="solar.StandardFilterFactory"/>
-        <filter class="solar.StopFilterFactory" words="stopwords.txt"/>
+        <tokenizer class="solr.LowerCaseTokenizerFactory"/>
+        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
       </analyzer>
     </fieldtype>
 
     <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
-    <fieldtype name="lowertok" class="solar.TextField">
-      <analyzer><tokenizer class="solar.LowerCaseTokenizerFactory"/></analyzer>
+    <fieldtype name="lowertok" class="solr.TextField">
+      <analyzer><tokenizer class="solr.LowerCaseTokenizerFactory"/></analyzer>
     </fieldtype>
-    <fieldtype name="standardtok" class="solar.TextField">
-      <analyzer><tokenizer class="solar.StandardTokenizerFactory"/></analyzer>
+    <fieldtype name="standardtok" class="solr.TextField">
+      <analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
     </fieldtype>
-    <fieldtype name="lettertok" class="solar.TextField">
-      <analyzer><tokenizer class="solar.LetterTokenizerFactory"/></analyzer>
+    <fieldtype name="lettertok" class="solr.TextField">
+      <analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
     </fieldtype>
-    <fieldtype name="whitetok" class="solar.TextField">
-      <analyzer><tokenizer class="solar.WhitespaceTokenizerFactory"/></analyzer>
+    <fieldtype name="whitetok" class="solr.TextField">
+      <analyzer><tokenizer class="solr.WhitespaceTokenizerFactory"/></analyzer>
     </fieldtype>
-    <fieldtype name="HTMLstandardtok" class="solar.TextField">
-      <analyzer><tokenizer class="solar.HTMLStripStandardTokenizerFactory"/></analyzer>
+    <fieldtype name="HTMLstandardtok" class="solr.TextField">
+      <analyzer><tokenizer class="solr.HTMLStripStandardTokenizerFactory"/></analyzer>
     </fieldtype>
-    <fieldtype name="HTMLwhitetok" class="solar.TextField">
-      <analyzer><tokenizer class="solar.HTMLStripWhitespaceTokenizerFactory"/></analyzer>
+    <fieldtype name="HTMLwhitetok" class="solr.TextField">
+      <analyzer><tokenizer class="solr.HTMLStripWhitespaceTokenizerFactory"/></analyzer>
     </fieldtype>
-    <fieldtype name="standardtokfilt" class="solar.TextField">
+    <fieldtype name="standardtokfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.StandardTokenizerFactory"/>
-        <filter class="solar.StandardFilterFactory"/>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StandardFilterFactory"/>
       </analyzer>
     </fieldtype>
-    <fieldtype name="standardfilt" class="solar.TextField">
+    <fieldtype name="standardfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.StandardFilterFactory"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.StandardFilterFactory"/>
       </analyzer>
     </fieldtype>
-    <fieldtype name="lowerfilt" class="solar.TextField">
+    <fieldtype name="lowerfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.LowerCaseFilterFactory"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
     </fieldtype>
-    <fieldtype name="porterfilt" class="solar.TextField">
+    <fieldtype name="porterfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.PorterStemFilterFactory"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.PorterStemFilterFactory"/>
       </analyzer>
     </fieldtype>
-    <!-- fieldtype name="snowballfilt" class="solar.TextField">
+    <!-- fieldtype name="snowballfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.SnowballPorterFilterFactory"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory"/>
       </analyzer>
     </fieldtype -->
-    <fieldtype name="engporterfilt" class="solar.TextField">
+    <fieldtype name="engporterfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.EnglishPorterFilterFactory"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.EnglishPorterFilterFactory"/>
       </analyzer>
     </fieldtype>
-    <fieldtype name="custengporterfilt" class="solar.TextField">
+    <fieldtype name="custengporterfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.EnglishPorterFilterFactory" protected="protwords.txt"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
       </analyzer>
     </fieldtype>
-    <fieldtype name="stopfilt" class="solar.TextField">
+    <fieldtype name="stopfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.StopFilterFactory" ignoreCase="true"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true"/>
       </analyzer>
     </fieldtype>
-    <fieldtype name="custstopfilt" class="solar.TextField">
+    <fieldtype name="custstopfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.StopFilterFactory" words="stopwords.txt"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
       </analyzer>
     </fieldtype>
-    <fieldtype name="lengthfilt" class="solar.TextField">
+    <fieldtype name="lengthfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-        <filter class="solar.LengthFilterFactory" min="2" max="5"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.LengthFilterFactory" min="2" max="5"/>
       </analyzer>
     </fieldtype>
 
-    <fieldtype name="subword" class="solar.TextField">
+    <fieldtype name="subword" class="solr.TextField">
       <analyzer type="index">
-          <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-          <filter class="solar.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-          <filter class="solar.LowerCaseFilterFactory"/>
-          <filter class="solar.StopFilterFactory"/>
-          <filter class="solar.EnglishPorterFilterFactory"/>
+          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+          <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+          <filter class="solr.LowerCaseFilterFactory"/>
+          <filter class="solr.StopFilterFactory"/>
+          <filter class="solr.EnglishPorterFilterFactory"/>
       </analyzer>
       <analyzer type="query">
-          <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-          <filter class="solar.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
-          <filter class="solar.LowerCaseFilterFactory"/>
-          <filter class="solar.StopFilterFactory"/>
-          <filter class="solar.EnglishPorterFilterFactory"/>
+          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+          <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
+          <filter class="solr.LowerCaseFilterFactory"/>
+          <filter class="solr.StopFilterFactory"/>
+          <filter class="solr.EnglishPorterFilterFactory"/>
       </analyzer>
     </fieldtype>
 
     <!-- more flexible in matching skus, but more chance of a false match -->
-    <fieldtype name="skutype1" class="solar.TextField">
+    <fieldtype name="skutype1" class="solr.TextField">
       <analyzer type="index">
-          <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-          <filter class="solar.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-          <filter class="solar.LowerCaseFilterFactory"/>
+          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+          <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+          <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
       <analyzer type="query">
-          <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-          <filter class="solar.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-          <filter class="solar.LowerCaseFilterFactory"/>
+          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+          <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+          <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
     </fieldtype>
 
     <!-- less flexible in matching skus, but less chance of a false match -->
-    <fieldtype name="skutype2" class="solar.TextField">
+    <fieldtype name="skutype2" class="solr.TextField">
       <analyzer type="index">
-          <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-          <filter class="solar.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-          <filter class="solar.LowerCaseFilterFactory"/>
+          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+          <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+          <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
       <analyzer type="query">
-          <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-          <filter class="solar.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-          <filter class="solar.LowerCaseFilterFactory"/>
+          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+          <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+          <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
     </fieldtype>
 
     <!-- less flexible in matching skus, but less chance of a false match -->
-    <fieldtype name="syn" class="solar.TextField">
+    <fieldtype name="syn" class="solr.TextField">
       <analyzer>
-          <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-          <filter name="syn" class="solar.SynonymFilterFactory" synonyms="synonyms.txt"/>
+          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+          <filter name="syn" class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
       </analyzer>
     </fieldtype>
 
-    <fieldtype  name="unstored" class="solar.StrField" indexed="true" stored="false"/>
+    <fieldtype  name="unstored" class="solr.StrField" indexed="true" stored="false"/>
 
 
-  <fieldtype name="textgap" class="solar.TextField" multiValued="true" positionIncrementGap="100">
+  <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
       <analyzer>
-          <tokenizer class="solar.WhitespaceTokenizerFactory"/>
-          <filter class="solar.LowerCaseFilterFactory"/>
+          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+          <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
   </fieldtype>