diff --git a/build-tools/pkgbuild.gradle b/build-tools/pkgbuild.gradle
index 10ad5ed88..834f5d038 100644
--- a/build-tools/pkgbuild.gradle
+++ b/build-tools/pkgbuild.gradle
@@ -18,7 +18,7 @@ apply plugin: 'nebula.ospackage'
 // This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name
 afterEvaluate {
     ospackage {
-        packageName = "opendistro-${name}"
+        packageName = "${name}"
         release = isSnapshot ? "0.1" : '1'
         version = "${project.version}" - "-SNAPSHOT"
 
diff --git a/build.gradle b/build.gradle
index d6b24cdc3..a1010dcb8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -154,20 +154,20 @@ run {
 }
 
 afterEvaluate {
-    project.tasks.getByName("run#installOpendistroForElasticsearchIndexManagementPlugin").dependsOn("run#installPlugin")
-    project.tasks.getByName("run#installPlugin").dependsOn.remove(project.tasks.getByName("run#installOpendistroForElasticsearchIndexManagementPlugin"))
+    project.tasks.getByName("run#installOpendistroIndexManagementPlugin").dependsOn("run#installPlugin")
+    project.tasks.getByName("run#installPlugin").dependsOn.remove(project.tasks.getByName("run#installOpendistroIndexManagementPlugin"))
     project.tasks.getByName("run#installPlugin").dependsOn("run#copyPlugins")
     project.tasks.getByName("run#start").dependsOn.remove(project.tasks.getByName("run#installPlugin"))
-    project.tasks.getByName("run#start").dependsOn("run#installOpendistroForElasticsearchIndexManagementPlugin")
+    project.tasks.getByName("run#start").dependsOn("run#installOpendistroIndexManagementPlugin")
 }
 
 tasks.whenTaskAdded { task ->
     if (task.name == "integTestCluster#wait") {
-        project.tasks.getByName("integTestCluster#installOpendistroForElasticsearchIndexManagementPlugin").dependsOn("integTestCluster#installPlugin")
-        project.tasks.getByName("integTestCluster#installPlugin").dependsOn.remove(project.tasks.getByName("integTestCluster#installOpendistroForElasticsearchIndexManagementPlugin"))
+        project.tasks.getByName("integTestCluster#installOpendistroIndexManagementPlugin").dependsOn("integTestCluster#installPlugin")
+        project.tasks.getByName("integTestCluster#installPlugin").dependsOn.remove(project.tasks.getByName("integTestCluster#installOpendistroIndexManagementPlugin"))
         project.tasks.getByName("integTestCluster#installPlugin").dependsOn("integTestCluster#copyPlugins")
         project.tasks.getByName("integTestCluster#start").dependsOn.remove(project.tasks.getByName("integTestCluster#installPlugin"))
-        project.tasks.getByName("integTestCluster#start").dependsOn("integTestCluster#installOpendistroForElasticsearchIndexManagementPlugin")
+        project.tasks.getByName("integTestCluster#start").dependsOn("integTestCluster#installOpendistroIndexManagementPlugin")
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index d69d04a40..373f76d9a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,4 +13,4 @@
  * permissions and limitations under the License.
  */
 
-rootProject.name = 'opendistro-for-elasticsearch-index-management'
+rootProject.name = 'opendistro-index-management'