diff --git a/dev-tools/integration-tests.xml b/dev-tools/integration-tests.xml
index 2d4556d084e..1a35a802fcf 100644
--- a/dev-tools/integration-tests.xml
+++ b/dev-tools/integration-tests.xml
@@ -37,7 +37,7 @@
                 args="${integ.args} -Des.path.repo=${integ.repo.home}"/>
 
     <!-- begin shield plugin mods -->
-    <run-script dir="${integ.home}" script="bin/elasticsearch-shield/esusers"
+    <run-script dir="${integ.home}" script="bin/shield/esusers"
                 args="useradd test_user -p changeme -r admin"/>
 
     <!-- seems waitfor task doesnt support basic auth?
diff --git a/src/main/java/org/elasticsearch/shield/ShieldPlugin.java b/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
index 48d6bf6e5b2..9c26ab09419 100644
--- a/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
+++ b/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
@@ -31,8 +31,7 @@ import java.util.Map;
  */
 public class ShieldPlugin extends AbstractPlugin {
 
-    // FIXME need to get this back to Shield once bugs fixed in core... https://github.com/elastic/elasticsearch/issues/12143
-    public static final String NAME = "elasticsearch-shield";
+    public static final String NAME = "shield";
 
     public static final String ENABLED_SETTING_NAME = NAME + ".enabled";
 
diff --git a/src/test/java/org/elasticsearch/shield/test/ShieldAssertions.java b/src/test/java/org/elasticsearch/shield/test/ShieldAssertions.java
index 28ad43b41e5..2eae3a18544 100644
--- a/src/test/java/org/elasticsearch/shield/test/ShieldAssertions.java
+++ b/src/test/java/org/elasticsearch/shield/test/ShieldAssertions.java
@@ -7,6 +7,7 @@ package org.elasticsearch.shield.test;
 
 import org.elasticsearch.ElasticsearchSecurityException;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.shield.ShieldPlugin;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
@@ -17,6 +18,6 @@ public class ShieldAssertions {
         assertThat(e.status(), is(RestStatus.UNAUTHORIZED));
         assertThat(e.getHeaderKeys(), hasSize(1));
         assertThat(e.getHeader("WWW-Authenticate"), notNullValue());
-        assertThat(e.getHeader("WWW-Authenticate"), contains("Basic realm=\"elasticsearch-shield\""));
+        assertThat(e.getHeader("WWW-Authenticate"), contains("Basic realm=\"" + ShieldPlugin.NAME + "\""));
     }
 }