diff --git a/client/java/solrj/solr-solrj-pom.xml.template b/client/java/solrj/solr-solrj-pom.xml.template
index bc4b743d372..eb880a1f93f 100644
--- a/client/java/solrj/solr-solrj-pom.xml.template
+++ b/client/java/solrj/solr-solrj-pom.xml.template
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-parent</artifactId>
     <version>@maven_version@</version>
   </parent>
diff --git a/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template b/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
index b9a8aee0cb1..13f6808e870 100644
--- a/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
+++ b/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-parent</artifactId>
     <version>@maven_version@</version>
   </parent>
diff --git a/lib/solr-commons-csv-pom.xml.template b/lib/solr-commons-csv-pom.xml.template
index 3b528005b0d..50a9fbb523a 100644
--- a/lib/solr-commons-csv-pom.xml.template
+++ b/lib/solr-commons-csv-pom.xml.template
@@ -22,12 +22,12 @@
   -->
 
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-parent</artifactId>
     <version>@maven_version@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-commons-csv</artifactId>
   <name>Solr Specific Commons CSV</name>
   <version>@maven_version@</version>
diff --git a/lib/solr-lucene-analyzers-pom.xml.template b/lib/solr-lucene-analyzers-pom.xml.template
index 2fa068d483c..757a2caf2f5 100644
--- a/lib/solr-lucene-analyzers-pom.xml.template
+++ b/lib/solr-lucene-analyzers-pom.xml.template
@@ -22,11 +22,11 @@
   -->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-lucene-contrib</artifactId>
     <version>@maven_version@</version>
   </parent>
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-lucene-analyzers</artifactId>
   <name>Solr Specific Lucene Analyzers</name>
   <version>@maven_version@</version>
diff --git a/lib/solr-lucene-contrib-pom.xml.template b/lib/solr-lucene-contrib-pom.xml.template
index 0d1f077c13b..bba6d506149 100644
--- a/lib/solr-lucene-contrib-pom.xml.template
+++ b/lib/solr-lucene-contrib-pom.xml.template
@@ -23,7 +23,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-parent</artifactId>
     <version>@maven_version@</version>
   </parent>
@@ -33,7 +33,7 @@
   <packaging>pom</packaging>
   <dependencies>
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-lucene-core</artifactId>
       <version>@maven_version@</version>
     </dependency>
diff --git a/lib/solr-lucene-core-pom.xml.template b/lib/solr-lucene-core-pom.xml.template
index 5125bb62281..9e0a3c4e419 100644
--- a/lib/solr-lucene-core-pom.xml.template
+++ b/lib/solr-lucene-core-pom.xml.template
@@ -22,12 +22,12 @@
   -->
 
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-parent</artifactId>
     <version>@maven_version@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-lucene-core</artifactId>
   <name>Solr Specific Lucene Core</name>
   <version>@maven_version@</version>
diff --git a/lib/solr-lucene-highlighter-pom.xml.template b/lib/solr-lucene-highlighter-pom.xml.template
index 2d3c1617015..1c3eab70770 100644
--- a/lib/solr-lucene-highlighter-pom.xml.template
+++ b/lib/solr-lucene-highlighter-pom.xml.template
@@ -23,11 +23,11 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-lucene-contrib</artifactId>
     <version>@maven_version@</version>
   </parent>
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-lucene-highlighter</artifactId>
   <name>Solr Specific Lucene Highlighter</name>
   <version>@maven_version@</version>
diff --git a/lib/solr-lucene-queries-pom.xml.template b/lib/solr-lucene-queries-pom.xml.template
index 829a363c999..858803a48ab 100644
--- a/lib/solr-lucene-queries-pom.xml.template
+++ b/lib/solr-lucene-queries-pom.xml.template
@@ -23,11 +23,11 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-lucene-contrib</artifactId>
     <version>@maven_version@</version>
   </parent>
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-lucene-queries</artifactId>
   <name>Solr Specific Lucene Queries</name>
   <version>@maven_version@</version>
diff --git a/lib/solr-lucene-snowball-pom.xml.template b/lib/solr-lucene-snowball-pom.xml.template
index 2c777a2b3ff..b40e8cd263e 100644
--- a/lib/solr-lucene-snowball-pom.xml.template
+++ b/lib/solr-lucene-snowball-pom.xml.template
@@ -23,11 +23,11 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-lucene-contrib</artifactId>
     <version>@maven_version@</version>
   </parent>
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-lucene-snowball</artifactId>
   <name>Solr Specific Lucene Snowball</name>
   <version>@maven_version@</version>
diff --git a/lib/solr-lucene-spellchecker-pom.xml.template b/lib/solr-lucene-spellchecker-pom.xml.template
index 87056a86d4a..b4a1435e68c 100644
--- a/lib/solr-lucene-spellchecker-pom.xml.template
+++ b/lib/solr-lucene-spellchecker-pom.xml.template
@@ -23,11 +23,11 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-lucene-contrib</artifactId>
     <version>@maven_version@</version>
   </parent>
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-lucene-spellchecker</artifactId>
   <name>Solr Specific Lucene Spellchecker</name>
   <version>@maven_version@</version>
diff --git a/src/maven/solr-common-pom.xml.template b/src/maven/solr-common-pom.xml.template
index bf637e79901..a8ed3e48cab 100644
--- a/src/maven/solr-common-pom.xml.template
+++ b/src/maven/solr-common-pom.xml.template
@@ -24,12 +24,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-parent</artifactId>
     <version>@maven_version@</version>
   </parent>
 
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-common</artifactId>
   <name>Apache Solr Common</name>
   <version>@maven_version@</version>
diff --git a/src/maven/solr-core-pom.xml.template b/src/maven/solr-core-pom.xml.template
index c956c4ad9a0..502a3095f88 100644
--- a/src/maven/solr-core-pom.xml.template
+++ b/src/maven/solr-core-pom.xml.template
@@ -24,12 +24,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.lucene.solr</groupId>
+    <groupId>org.apache.solr</groupId>
     <artifactId>solr-parent</artifactId>
     <version>@maven_version@</version>
   </parent>
 
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-core</artifactId>
   <name>Apache Solr Core</name>
   <version>@maven_version@</version>
@@ -40,39 +40,39 @@
 
     <!-- Solr -->
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-common</artifactId>
       <version>@maven_version@</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
       <version>@maven_version@</version>
     </dependency>
 
     <!-- Solr Specific Lucene -->
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-lucene-analyzers</artifactId>
       <version>@maven_version@</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-lucene-highlighter</artifactId>
       <version>@maven_version@</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-lucene-queries</artifactId>
       <version>@maven_version@</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-lucene-snowball</artifactId>
       <version>@maven_version@</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-lucene-spellchecker</artifactId>
       <version>@maven_version@</version>
     </dependency>
@@ -101,7 +101,7 @@
 
     <!-- Solr specific commons csv -->
     <dependency>
-      <groupId>org.apache.lucene.solr</groupId>
+      <groupId>org.apache.solr</groupId>
       <artifactId>solr-commons-csv</artifactId>
       <version>@maven_version@</version>
     </dependency>
diff --git a/src/maven/solr-parent-pom.xml.template b/src/maven/solr-parent-pom.xml.template
index e7902b4796a..0f9e85f7a3b 100644
--- a/src/maven/solr-parent-pom.xml.template
+++ b/src/maven/solr-parent-pom.xml.template
@@ -29,7 +29,7 @@
     <version>4</version>
   </parent>
 
-  <groupId>org.apache.lucene.solr</groupId>
+  <groupId>org.apache.solr</groupId>
   <artifactId>solr-parent</artifactId>
   <name>Apache Solr Parent POM</name>
   <version>@maven_version@</version>