diff --git a/marvel/pom.xml b/marvel/pom.xml
index 4af80138d34..7274cb7b63f 100644
--- a/marvel/pom.xml
+++ b/marvel/pom.xml
@@ -66,7 +66,7 @@
                             <artifactItems combine.children="append">
                                 <artifactItem>
                                     <groupId>org.elasticsearch.plugin</groupId>
-                                    <artifactId>elasticsearch-license</artifactId>
+                                    <artifactId>license</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
diff --git a/qa/shield-core-rest-tests/pom.xml b/qa/shield-core-rest-tests/pom.xml
index 931f5304614..5f0733d0957 100644
--- a/qa/shield-core-rest-tests/pom.xml
+++ b/qa/shield-core-rest-tests/pom.xml
@@ -24,7 +24,7 @@
     <elasticsearch.integ.antfile>${project.basedir}/integration-tests.xml</elasticsearch.integ.antfile>
     <tests.rest.load_packaged>true</tests.rest.load_packaged>
     <tests.rest.blacklist>indices.get/10_basic/*allow_no_indices*,cat.count/10_basic/Test cat count output,cat.aliases/10_basic/Empty cluster,indices.segments/10_basic/no segments test,indices.clear_cache/10_basic/clear_cache test,indices.status/10_basic/Indices status test,cat.indices/10_basic/Test cat indices output,cat.recovery/10_basic/Test cat recovery output,cat.shards/10_basic/Test cat shards output,termvector/20_issue7121/*,index/10_with_id/Index with ID,indices.get_alias/20_emtpy/*,cat.segments/10_basic/Test cat segments output,indices.put_settings/10_basic/Test indices settings allow_no_indices,indices.put_settings/10_basic/Test indices settings ignore_unavailable,indices.refresh/10_basic/Indices refresh test no-match wildcard,indices.stats/10_index/Index - star*,indices.recovery/10_basic/Indices recovery test*,template/30_render_search_template/*,indices.shard_stores/10_basic/no indices test,cat.nodeattrs/10_basic/Test cat nodes attrs output</tests.rest.blacklist>
-    <xplugins.list>elasticsearch-license,elasticsearch-shield</xplugins.list>
+    <xplugins.list>license,shield</xplugins.list>
   </properties>
 
   <dependencies>
diff --git a/qa/smoke-test-plugins-ssl/pom.xml b/qa/smoke-test-plugins-ssl/pom.xml
index 71872f91542..9bba370480c 100644
--- a/qa/smoke-test-plugins-ssl/pom.xml
+++ b/qa/smoke-test-plugins-ssl/pom.xml
@@ -25,7 +25,7 @@
     <elasticsearch.integ.antfile>${project.basedir}/integration-tests.xml</elasticsearch.integ.antfile>
     <tests.rest.suite>smoke_test_plugins_ssl</tests.rest.suite>
     <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    <xplugins.list>elasticsearch-license,elasticsearch-marvel,elasticsearch-shield,elasticsearch-watcher</xplugins.list>
+    <xplugins.list>license,marvel,shield,watcher</xplugins.list>
     <ssl.antfile>${project.basedir}/ssl-setup.xml</ssl.antfile>
     <keystore.path>${project.build.outputDirectory}/test-node.jks</keystore.path>
   </properties>
diff --git a/qa/smoke-test-plugins/pom.xml b/qa/smoke-test-plugins/pom.xml
index 92697f6cb14..4b574605902 100644
--- a/qa/smoke-test-plugins/pom.xml
+++ b/qa/smoke-test-plugins/pom.xml
@@ -25,7 +25,7 @@
     <elasticsearch.integ.antfile>${project.basedir}/integration-tests.xml</elasticsearch.integ.antfile>
     <tests.rest.suite>smoke_test_plugins</tests.rest.suite>
     <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    <xplugins.list>elasticsearch-license,elasticsearch-marvel,elasticsearch-shield,elasticsearch-watcher</xplugins.list>
+    <xplugins.list>license,marvel,shield,watcher</xplugins.list>
   </properties>
 
   <dependencies>
diff --git a/qa/smoke-test-watcher-with-shield/pom.xml b/qa/smoke-test-watcher-with-shield/pom.xml
index 28dda19abdb..6a327ebe5ed 100644
--- a/qa/smoke-test-watcher-with-shield/pom.xml
+++ b/qa/smoke-test-watcher-with-shield/pom.xml
@@ -36,7 +36,7 @@
     <skip.unit.tests>true</skip.unit.tests>
     <elasticsearch.integ.antfile>${project.basedir}/integration-tests.xml</elasticsearch.integ.antfile>
     <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    <xplugins.list>elasticsearch-license,elasticsearch-shield,elasticsearch-watcher</xplugins.list>
+    <xplugins.list>license,shield,watcher</xplugins.list>
     <tests.rest.blacklist>hijack/10_basic/*</tests.rest.blacklist>
   </properties>
 
diff --git a/shield/src/main/assemblies/plugin.xml b/shield/src/main/assemblies/plugin.xml
index 7eea1d91150..c6d7b362671 100644
--- a/shield/src/main/assemblies/plugin.xml
+++ b/shield/src/main/assemblies/plugin.xml
@@ -22,7 +22,7 @@
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveDependencies>false</useTransitiveDependencies>
             <includes>
-                <include>org.elasticsearch.plugin:elasticsearch-shield</include>
+                <include>org.elasticsearch.plugin:shield</include>
                 <include>dk.brics.automaton:automaton</include>
                 <include>com.unboundid:unboundid-ldapsdk</include>
             </includes>