Index: lucene/contrib/queryparser/build.xml
===================================================================
--- lucene/contrib/queryparser/build.xml	(revision 1143245)
+++ lucene/contrib/queryparser/build.xml	(working copy)
@@ -17,7 +17,7 @@
     limitations under the License.
  -->
 
-<project name="queryparser" default="default">
+<project name="queryparser-contrib" default="default">
 
   <description>
     Flexible Query Parser
Index: dev-tools/idea/.idea/modules.xml
===================================================================
--- dev-tools/idea/.idea/modules.xml	(revision 1143245)
+++ dev-tools/idea/.idea/modules.xml	(working copy)
@@ -10,7 +10,7 @@
       <module filepath="$PROJECT_DIR$/lucene/contrib/memory/memory.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/queries/queries-contrib.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/contrib/queryparser/queryparser.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/contrib/queryparser/queryparser-contrib.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/spatial/spatial.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/wordnet/wordnet.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/xml-query-parser/xml-query-parser.iml" />
Index: dev-tools/idea/.idea/workspace.xml
===================================================================
--- dev-tools/idea/.idea/workspace.xml	(revision 1143245)
+++ dev-tools/idea/.idea/workspace.xml	(working copy)
@@ -142,7 +142,7 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="queryparser contrib" type="JUnit" factoryName="JUnit">
-      <module name="queryparser" />
+      <module name="queryparser-contrib" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/queryparser" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
Index: dev-tools/idea/lucene/contrib/queryparser/queryparser.iml (deleted)
===================================================================
Index: dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
===================================================================
--- dev-tools/maven/lucene/contrib/queryparser/pom.xml.template	(revision 1143245)
+++ dev-tools/maven/lucene/contrib/queryparser/pom.xml.template	(working copy)
@@ -27,7 +27,7 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
-  <artifactId>lucene-queryparser</artifactId>
+  <artifactId>lucene-queryparser-contrib</artifactId>
   <packaging>jar</packaging>
   <name>Lucene Query Parser</name>
   <description>