diff --git a/settings.gradle b/settings.gradle
index b9321b58638..98d7aa3cb63 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,8 +2,7 @@ plugins {
   id "com.gradle.enterprise" version "3.5"
 }
 
-String dirName = rootProject.projectDir.name
-rootProject.name = dirName
+rootProject.name = "elasticsearch"
 
 List projects = [
   'build-tools',
@@ -133,7 +132,7 @@ project(":test:external-modules").children.each { testProject ->
 }
 
 // look for extra plugins for elasticsearch
-File extraProjects = new File(rootProject.projectDir.parentFile, "${dirName}-extra")
+File extraProjects = new File(rootProject.projectDir.parentFile, "${rootProject.projectDir.name}-extra")
 if (extraProjects.exists()) {
   for (File extraProjectDir : extraProjects.listFiles()) {
     addSubProjects('', extraProjectDir)