diff --git a/migrate.sh b/migrate.sh
index c8f80ccd828..a47e73c0482 100755
--- a/migrate.sh
+++ b/migrate.sh
@@ -68,7 +68,7 @@ function migratePlugin() {
 	mkdir -p plugins/$1
 	git mv -k * plugins/$1 > /dev/null 2>/dev/null       
 	git rm .gitignore > /dev/null 2>/dev/null
-	# echo "### change $1 groupId to org.elasticsearch.plugins"
+	# echo "### change $1 groupId to org.elasticsearch.plugin"
 	# Change the groupId to avoid conflicts with existing 2.0.0 versions.
 	replaceLine "    <groupId>org.elasticsearch<\/groupId>" "    <groupId>org.elasticsearch.plugin<\/groupId>" "plugins/$1/pom.xml"
 
diff --git a/plugins/analysis-icu/pom.xml b/plugins/analysis-icu/pom.xml
index a25f6f350f5..b13f69dbd53 100644
--- a/plugins/analysis-icu/pom.xml
+++ b/plugins/analysis-icu/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-analysis-icu</artifactId>
-    <name>Elasticsearch ICU Analysis plugin</name>
+    <artifactId>analysis-icu</artifactId>
+    <name>Plugin: Analysis: ICU</name>
     <description>The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding ICU relates analysis components.</description>
 
     <properties>
diff --git a/plugins/analysis-kuromoji/pom.xml b/plugins/analysis-kuromoji/pom.xml
index d6e87ad17d9..71d290fddc1 100644
--- a/plugins/analysis-kuromoji/pom.xml
+++ b/plugins/analysis-kuromoji/pom.xml
@@ -6,13 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-analysis-kuromoji</artifactId>
-    <packaging>jar</packaging>
-    <name>Elasticsearch Japanese (kuromoji) Analysis plugin</name>
+    <artifactId>analysis-kuromoji</artifactId>
+    <name>Plugin: Analysis: Japanese (kuromoji)</name>
     <description>The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into elasticsearch.</description>
 
     <properties>
diff --git a/plugins/analysis-phonetic/pom.xml b/plugins/analysis-phonetic/pom.xml
index ae3b7917872..a5b726ecf7d 100644
--- a/plugins/analysis-phonetic/pom.xml
+++ b/plugins/analysis-phonetic/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-analysis-phonetic</artifactId>
-    <name>Elasticsearch Phonetic Analysis plugin</name>
+    <artifactId>analysis-phonetic</artifactId>
+    <name>Plugin: Analysis: Phonetic</name>
     <description>The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch.</description>
 
     <properties>
diff --git a/plugins/analysis-smartcn/pom.xml b/plugins/analysis-smartcn/pom.xml
index a25e787cccb..294dbaa4b7a 100644
--- a/plugins/analysis-smartcn/pom.xml
+++ b/plugins/analysis-smartcn/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-analysis-smartcn</artifactId>
-    <name>Elasticsearch Smart Chinese Analysis plugin</name>
+    <artifactId>analysis-smartcn</artifactId>
+    <name>Plugin: Analysis: Smart Chinese (smartcn)</name>
     <description>Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch.</description>
 
     <properties>
diff --git a/plugins/analysis-stempel/pom.xml b/plugins/analysis-stempel/pom.xml
index 7fcce1d14af..139e3dbd908 100644
--- a/plugins/analysis-stempel/pom.xml
+++ b/plugins/analysis-stempel/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-analysis-stempel</artifactId>
-    <name>Elasticsearch Stempel (Polish) Analysis plugin</name>
+    <artifactId>analysis-stempel</artifactId>
+    <name>Plugin: Analysis: Polish (stempel)</name>
     <description>The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into elasticsearch.</description>
 
     <properties>
diff --git a/plugins/cloud-aws/pom.xml b/plugins/cloud-aws/pom.xml
index 03d157eadff..157a35077d8 100644
--- a/plugins/cloud-aws/pom.xml
+++ b/plugins/cloud-aws/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-cloud-aws</artifactId>
-    <name>Elasticsearch AWS cloud plugin</name>
+    <artifactId>cloud-aws</artifactId>
+    <name>Plugin: Cloud: AWS</name>
     <description>The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.</description>
 
     <properties>
diff --git a/plugins/cloud-azure/pom.xml b/plugins/cloud-azure/pom.xml
index c7c83816320..f7fa9dceb2d 100644
--- a/plugins/cloud-azure/pom.xml
+++ b/plugins/cloud-azure/pom.xml
@@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-cloud-azure</artifactId>
-    <name>Elasticsearch Azure cloud plugin</name>
+    <artifactId>cloud-azure</artifactId>
+    <name>Plugin: Cloud: Azure</name>
     <description>The Azure Cloud plugin allows to use Azure API for the unicast discovery mechanism and add Azure storage repositories.</description>
 
     <properties>
diff --git a/plugins/cloud-gce/pom.xml b/plugins/cloud-gce/pom.xml
index 1d62fdb327e..724036aafcd 100644
--- a/plugins/cloud-gce/pom.xml
+++ b/plugins/cloud-gce/pom.xml
@@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-cloud-gce</artifactId>
-    <name>Elasticsearch Google Compute Engine cloud plugin</name>
+    <artifactId>cloud-gce</artifactId>
+    <name>Plugin: Cloud: Google Compute Engine</name>
     <description>The Google Compute Engine (GCE) Cloud plugin allows to use GCE API for the unicast discovery mechanism.</description>
 
     <properties>
diff --git a/plugins/delete-by-query/pom.xml b/plugins/delete-by-query/pom.xml
index d7ea468088e..07d3bb8fbe8 100644
--- a/plugins/delete-by-query/pom.xml
+++ b/plugins/delete-by-query/pom.xml
@@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-delete-by-query</artifactId>
-    <name>Elasticsearch Delete By Query plugin</name>
+    <artifactId>delete-by-query</artifactId>
+    <name>Plugin: Delete By Query</name>
     <description>The Delete By Query plugin allows to delete documents in Elasticsearch with a single query.</description>
 
     <properties>
diff --git a/plugins/jvm-example/pom.xml b/plugins/jvm-example/pom.xml
index 0bfd84b82b9..be67cf54eb1 100644
--- a/plugins/jvm-example/pom.xml
+++ b/plugins/jvm-example/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-jvm-example</artifactId>
-    <name>Elasticsearch example JVM plugin</name>
+    <artifactId>jvm-example</artifactId>
+    <name>Plugin: JVM example</name>
     <description>Demonstrates all the pluggable Java entry points in Elasticsearch</description>
 
     <properties>
diff --git a/plugins/lang-javascript/pom.xml b/plugins/lang-javascript/pom.xml
index f283aa73989..eaaa29a34b7 100644
--- a/plugins/lang-javascript/pom.xml
+++ b/plugins/lang-javascript/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-lang-javascript</artifactId>
-    <name>Elasticsearch JavaScript language plugin</name>
+    <artifactId>lang-javascript</artifactId>
+    <name>Plugin: Language: JavaScript</name>
     <description>The JavaScript language plugin allows to have javascript as the language of scripts to execute.</description>
 
     <properties>
diff --git a/plugins/lang-python/pom.xml b/plugins/lang-python/pom.xml
index 704aff5379c..7b44f61889b 100644
--- a/plugins/lang-python/pom.xml
+++ b/plugins/lang-python/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-lang-python</artifactId>
-    <name>Elasticsearch Python language plugin</name>
+    <artifactId>lang-python</artifactId>
+    <name>Plugin: Language: Python</name>
     <description>The Python language plugin allows to have python as the language of scripts to execute.</description>
 
     <properties>
diff --git a/plugins/mapper-size/pom.xml b/plugins/mapper-size/pom.xml
index 2ec3d475e2b..bd483e1868d 100644
--- a/plugins/mapper-size/pom.xml
+++ b/plugins/mapper-size/pom.xml
@@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-mapper-size</artifactId>
-    <name>Elasticsearch Mapper size plugin</name>
+    <artifactId>mapper-size</artifactId>
+    <name>Plugin: Mapper: Size</name>
     <description>The Mapper Size plugin allows document to record their uncompressed size at index time.</description>
 
     <properties>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index fbf88b089fe..f9a976b4946 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -6,10 +6,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.elasticsearch.plugin</groupId>
-    <artifactId>elasticsearch-plugin</artifactId>
+    <artifactId>plugins</artifactId>
     <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Elasticsearch Plugin POM</name>
+    <name>Plugin: Parent POM</name>
     <inceptionYear>2009</inceptionYear>
     <description>A parent project for Elasticsearch plugins</description>
 
diff --git a/plugins/site-example/pom.xml b/plugins/site-example/pom.xml
index f346678ffc0..3c25d5ae130 100644
--- a/plugins/site-example/pom.xml
+++ b/plugins/site-example/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>elasticsearch-plugin</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>elasticsearch-site-example</artifactId>
-    <name>Elasticsearch Example site plugin</name>
+    <artifactId>site-example</artifactId>
+    <name>Plugin: Example site</name>
     <description>Demonstrates how to serve resources via elasticsearch.</description>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 47f6779ef46..787a4b07f0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1216,6 +1216,7 @@ org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UT
                                         <arg value="--check"/>
                                         <arg value="${project.licenses.dir}"/>
                                         <arg value="${project.licenses.check_target}"/>
+                                        <arg value="${project.build.finalName}"/>
                                     </exec>
                                 </target>
                             </configuration>
diff --git a/qa/smoke-test-plugins/pom.xml b/qa/smoke-test-plugins/pom.xml
index b56bc35e57b..5fed8b67d6e 100644
--- a/qa/smoke-test-plugins/pom.xml
+++ b/qa/smoke-test-plugins/pom.xml
@@ -247,7 +247,7 @@
                  <!-- plugins -->
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-analysis-kuromoji</artifactId>
+                   <artifactId>analysis-kuromoji</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -255,7 +255,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-analysis-smartcn</artifactId>
+                   <artifactId>analysis-smartcn</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -263,7 +263,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-analysis-stempel</artifactId>
+                   <artifactId>analysis-stempel</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -271,7 +271,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-analysis-phonetic</artifactId>
+                   <artifactId>analysis-phonetic</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -279,7 +279,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-analysis-icu</artifactId>
+                   <artifactId>analysis-icu</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -287,7 +287,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-cloud-gce</artifactId>
+                   <artifactId>cloud-gce</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -295,7 +295,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-cloud-azure</artifactId>
+                   <artifactId>cloud-azure</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -303,7 +303,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-cloud-aws</artifactId>
+                   <artifactId>cloud-aws</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -311,7 +311,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-delete-by-query</artifactId>
+                   <artifactId>delete-by-query</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -319,7 +319,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-lang-python</artifactId>
+                   <artifactId>lang-python</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -327,7 +327,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-lang-javascript</artifactId>
+                   <artifactId>lang-javascript</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -343,7 +343,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-mapper-size</artifactId>
+                   <artifactId>mapper-size</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -351,7 +351,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-site-example</artifactId>
+                   <artifactId>site-example</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -359,7 +359,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>elasticsearch-jvm-example</artifactId>
+                   <artifactId>jvm-example</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>