diff --git a/apm-agent-java/README.md b/elastic-apm-agent/README.md
similarity index 100%
rename from apm-agent-java/README.md
rename to elastic-apm-agent/README.md
diff --git a/apm-agent-java/pom.xml b/elastic-apm-agent/pom.xml
similarity index 99%
rename from apm-agent-java/pom.xml
rename to elastic-apm-agent/pom.xml
index b8fd7e495e..ec04df12f1 100644
--- a/apm-agent-java/pom.xml
+++ b/elastic-apm-agent/pom.xml
@@ -12,7 +12,7 @@
     </parent>
     <packaging>jar</packaging>
 
-    <artifactId>apm-agent-java</artifactId>
+    <artifactId>elastic-apm-agent</artifactId>
     <name>${project.groupId}:${project.artifactId}</name>
 
     <build>
diff --git a/apm-agent-java/src/test/java/co/elastic/apm/configuration/ConfigurationExporterTest.java b/elastic-apm-agent/src/test/java/co/elastic/apm/configuration/ConfigurationExporterTest.java
similarity index 100%
rename from apm-agent-java/src/test/java/co/elastic/apm/configuration/ConfigurationExporterTest.java
rename to elastic-apm-agent/src/test/java/co/elastic/apm/configuration/ConfigurationExporterTest.java
diff --git a/apm-agent-java/src/test/resources/configuration.asciidoc.ftl b/elastic-apm-agent/src/test/resources/configuration.asciidoc.ftl
similarity index 100%
rename from apm-agent-java/src/test/resources/configuration.asciidoc.ftl
rename to elastic-apm-agent/src/test/resources/configuration.asciidoc.ftl
diff --git a/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/AbstractTomcatIntegrationTest.java b/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/AbstractTomcatIntegrationTest.java
index d6937b5970..f3381b12d9 100644
--- a/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/AbstractTomcatIntegrationTest.java
+++ b/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/AbstractTomcatIntegrationTest.java
@@ -75,8 +75,8 @@ public abstract class AbstractTomcatIntegrationTest {
     }
 
     private static String getPathToJavaagent() {
-        File agentBuildDir = new File("../../apm-agent-java/target/");
-        FileFilter fileFilter = new WildcardFileFilter("apm-agent-java-*.jar");
+        File agentBuildDir = new File("../../elastic-apm-agent/target/");
+        FileFilter fileFilter = new WildcardFileFilter("elastic-apm-agent-*.jar");
         for (File file : agentBuildDir.listFiles(fileFilter)) {
             if (!file.getAbsolutePath().endsWith("javadoc.jar") && !file.getAbsolutePath().endsWith("sources.jar")) {
                 return file.getAbsolutePath();
diff --git a/pom.xml b/pom.xml
index faa6eb8223..8d64af9ff5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
 
     <modules>
         <module>apm-agent-core</module>
-        <module>apm-agent-java</module>
+        <module>elastic-apm-agent</module>
         <module>apm-agent-benchmarks</module>
         <module>apm-agent-plugins</module>
         <module>apm-agent-api</module>