diff --git a/.circleci/collect_libs.sh b/.circleci/collect_libs.sh
index cf87a4bd7bea..31247730e1eb 100755
--- a/.circleci/collect_libs.sh
+++ b/.circleci/collect_libs.sh
@@ -9,5 +9,5 @@ set -e
 LIBS_DIR=./libs/
 mkdir -p $LIBS_DIR >/dev/null 2>&1
 
-cp workspace/java-agent/build/libs/*.jar $LIBS_DIR/
+cp workspace/opentelemetry-javaagent/build/libs/*.jar $LIBS_DIR/
 cp workspace/auto-exporters/*/build/libs/*.jar $LIBS_DIR/
diff --git a/benchmark/benchmark.gradle b/benchmark/benchmark.gradle
index 62271c6b8149..bcc00b8e0295 100644
--- a/benchmark/benchmark.gradle
+++ b/benchmark/benchmark.gradle
@@ -43,7 +43,7 @@ jmh {
   jmhVersion = '1.23' // Specifies JMH version
 }
 
-tasks.jmh.dependsOn(':opentelemetry-auto:shadowJar')
+tasks.jmh.dependsOn(':opentelemetry-javaagent:shadowJar')
 
 /*
 If using libasyncProfiler, use the following to generate nice svg flamegraphs.
diff --git a/build.gradle b/build.gradle
index 0dcaefac85fe..a28c40188fb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ release {
 def isCI = System.getenv("CI") != null
 
 allprojects {
-  group = 'io.opentelemetry.auto'
+  group = 'io.opentelemetry.instrumentation.auto'
 
   if (isCI) {
     buildDir = "$rootDir/workspace/${projectDir.path.replace(rootDir.path, '')}/build/"
@@ -42,7 +42,7 @@ repositories {
   mavenCentral()
 }
 
-description = 'trace-java'
+description = 'OpenTelemetry instrumentations for Java'
 
 wrapper {
   distributionType = Wrapper.DistributionType.ALL
diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle
index 0e5fdcefc9e2..4a5d76f4b12a 100644
--- a/gradle/instrumentation.gradle
+++ b/gradle/instrumentation.gradle
@@ -12,6 +12,9 @@ byteBuddy {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
+if (project.ext.find("skipPublish") != true) {
+  apply from: "$rootDir/gradle/publish.gradle"
+}
 
 tasks.withType(Test) {
   forkEvery = 1
@@ -43,7 +46,7 @@ afterEvaluate {
     testImplementation project(':instrumentation:java-concurrent')
     // FIXME: we should enable this, but currently this fails tests for google http client
     //testImplementation project(':instrumentation:http-url-connection')
-    testImplementation project(':instrumentation:java-class-loader')
+    testImplementation project(':instrumentation:java-classloader')
 
     testImplementation project(':testing')
     testAnnotationProcessor deps.autoservice
diff --git a/gradle/java.gradle b/gradle/java.gradle
index acd62c4b0b8b..fa0686a55033 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -11,7 +11,7 @@ apply from: "$rootDir/gradle/spotbugs.gradle"
 def applyCodeCoverage = !(
     project.path.startsWith(":smoke-tests") ||
         //TODO why some tests fail on java 11 if jacoco is present?
-        project.path == ":opentelemetry-auto" ||
+        project.path == ":opentelemetry-javaagent" ||
         project.path == ":load-generator" ||
         project.path.startsWith(":benchmark") ||
         project.path.startsWith(":instrumentation"))
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index ef45b3ff037f..0124a5a5b161 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -10,9 +10,16 @@ publishing {
   }
   publications {
     maven(MavenPublication) {
-      artifact javadocJar
-      artifact sourcesJar
-      artifact shadowJar
+      if (project.tasks.findByName("shadowJar") != null) {
+        project.shadow.component(it)
+        //These two are here just to satisfy Maven Central
+        artifact sourcesJar
+        artifact javadocJar
+      } else {
+        from components.java
+      }
+
+      artifactId = artifactPrefix(project) + artifactId
 
       pom {
         name = 'OpenTelemetry Instrumentation for Java'
@@ -50,6 +57,16 @@ publishing {
   }
 }
 
+private String artifactPrefix(Project p){
+  if(p.name.startsWith("opentelemetry")){
+    return ''
+  }
+  if(p.group == 'io.opentelemetry.instrumentation.auto'){
+    return 'opentelemetry-auto-'
+  }
+  return 'opentelemetry-'
+}
+
 bintray {
   user = System.getenv('BINTRAY_USER')
   key = System.getenv('BINTRAY_API_KEY')
diff --git a/instrumentation-core/aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle b/instrumentation-core/aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle
index 14a533b643af..41fb85c4630e 100644
--- a/instrumentation-core/aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle
+++ b/instrumentation-core/aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle
@@ -2,7 +2,10 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+group = 'io.opentelemetry.instrumentation'
+
 apply from: "$rootDir/gradle/java.gradle"
+apply from: "$rootDir/gradle/publish.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {
diff --git a/instrumentation/cdi-testing/cdi-testing.gradle b/instrumentation/cdi-testing/cdi-testing.gradle
index 52d9802cfd23..0498adec0fe7 100644
--- a/instrumentation/cdi-testing/cdi-testing.gradle
+++ b/instrumentation/cdi-testing/cdi-testing.gradle
@@ -1,3 +1,4 @@
+ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
diff --git a/instrumentation/dropwizard-testing/dropwizard-testing.gradle b/instrumentation/dropwizard-testing/dropwizard-testing.gradle
index 81206b6957ed..a8eadf981b15 100644
--- a/instrumentation/dropwizard-testing/dropwizard-testing.gradle
+++ b/instrumentation/dropwizard-testing/dropwizard-testing.gradle
@@ -1,3 +1,4 @@
+ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 //apply plugin: 'org.unbroken-dome.test-sets'
@@ -10,7 +11,7 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
 
 dependencies {
   testCompile project(':instrumentation:jaxrs:jaxrs-2.0')
-  testCompile project(':instrumentation:servlet:request-3.0')
+  testCompile project(':instrumentation:servlet:servlet-3.0')
 
   // First version with DropwizardTestSupport:
   testCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'
diff --git a/instrumentation/java-class-loader/java-class-loader.gradle b/instrumentation/java-classloader/java-classloader.gradle
similarity index 100%
rename from instrumentation/java-class-loader/java-class-loader.gradle
rename to instrumentation/java-classloader/java-classloader.gradle
diff --git a/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle b/instrumentation/java-classloader/jboss-testing/jboss-testing.gradle
similarity index 66%
rename from instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle
rename to instrumentation/java-classloader/jboss-testing/jboss-testing.gradle
index 74ebe33832b9..a950c49d046e 100644
--- a/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle
+++ b/instrumentation/java-classloader/jboss-testing/jboss-testing.gradle
@@ -1,7 +1,8 @@
+ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 dependencies {
-  testCompile project(':instrumentation:java-class-loader')
+  testCompile project(':instrumentation:java-classloader')
 
   testCompile group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final'
 }
diff --git a/instrumentation/java-class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy b/instrumentation/java-classloader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy
similarity index 100%
rename from instrumentation/java-class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy
rename to instrumentation/java-classloader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy
diff --git a/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle b/instrumentation/java-classloader/osgi-testing/osgi-testing.gradle
similarity index 86%
rename from instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle
rename to instrumentation/java-classloader/osgi-testing/osgi-testing.gradle
index 4a030c77b31f..31a487c1629c 100644
--- a/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle
+++ b/instrumentation/java-classloader/osgi-testing/osgi-testing.gradle
@@ -1,7 +1,8 @@
+ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 dependencies {
-  testCompile project(':instrumentation:java-class-loader')
+  testCompile project(':instrumentation:java-classloader')
 
   // TODO: we should separate core and Eclipse tests at some point,
   // but right now core-specific tests are quite dump and are run with
diff --git a/instrumentation/java-class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy b/instrumentation/java-classloader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy
similarity index 100%
rename from instrumentation/java-class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy
rename to instrumentation/java-classloader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy
diff --git a/instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java b/instrumentation/java-classloader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java
similarity index 100%
rename from instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java
rename to instrumentation/java-classloader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java
diff --git a/instrumentation/java-class-loader/src/test/groovy/ClassLoadingTest.groovy b/instrumentation/java-classloader/src/test/groovy/ClassLoadingTest.groovy
similarity index 100%
rename from instrumentation/java-class-loader/src/test/groovy/ClassLoadingTest.groovy
rename to instrumentation/java-classloader/src/test/groovy/ClassLoadingTest.groovy
diff --git a/instrumentation/java-class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy b/instrumentation/java-classloader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy
similarity index 100%
rename from instrumentation/java-class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy
rename to instrumentation/java-classloader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy
diff --git a/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle b/instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle
similarity index 88%
rename from instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle
rename to instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle
index 70030f437e80..c5a8ebace744 100644
--- a/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle
+++ b/instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle
@@ -1,3 +1,5 @@
+ext.skipPublish = true
+
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
@@ -17,7 +19,7 @@ testSets {
 }
 
 dependencies {
-  testCompile project(':instrumentation:java-class-loader')
+  testCompile project(':instrumentation:java-classloader')
 
   //This seems to be the earliest version that has org.apache.catalina.loader.WebappClassLoaderBase
   //Older versions would require slightly different instrumentation.
diff --git a/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle b/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle
index d8ffa4b63b72..6c5bd0941be8 100644
--- a/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle
+++ b/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle
@@ -1,6 +1,7 @@
 // Set properties before any plugins get loaded
 ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
+  skipPublish = true
 }
 
 apply from: "$rootDir/gradle/instrumentation.gradle"
diff --git a/instrumentation/java-concurrent/akka-testing/akka-testing.gradle b/instrumentation/java-concurrent/akka-testing/akka-testing.gradle
index cc8f5a953744..04c2e98a05ca 100644
--- a/instrumentation/java-concurrent/akka-testing/akka-testing.gradle
+++ b/instrumentation/java-concurrent/akka-testing/akka-testing.gradle
@@ -1,3 +1,4 @@
+ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply from: "$rootDir/gradle/test-with-scala.gradle"
 
diff --git a/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle b/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle
index b9795a675cbf..55042543536e 100644
--- a/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle
+++ b/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle
@@ -1,3 +1,4 @@
+ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply from: "$rootDir/gradle/test-with-kotlin.gradle"
 
diff --git a/instrumentation/java-concurrent/scala-testing/scala-testing.gradle b/instrumentation/java-concurrent/scala-testing/scala-testing.gradle
index 634c41f6dece..b2454b1fbef8 100644
--- a/instrumentation/java-concurrent/scala-testing/scala-testing.gradle
+++ b/instrumentation/java-concurrent/scala-testing/scala-testing.gradle
@@ -1,3 +1,4 @@
+ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply from: "$rootDir/gradle/test-with-scala.gradle"
 
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle
index 05a5dbf3a010..ba56cff5fd91 100644
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle
@@ -27,7 +27,7 @@ testSets {
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
 
-  testCompile project(':instrumentation:servlet:request-3.0')
+  testCompile project(':instrumentation:servlet:servlet-3.0')
   testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-jersey-2.0')
   testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0')
   testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1')
diff --git a/instrumentation/jsp-2.3/jsp-2.3.gradle b/instrumentation/jsp-2.3/jsp-2.3.gradle
index 35eba9f571c4..4dd5ba54eafd 100644
--- a/instrumentation/jsp-2.3/jsp-2.3.gradle
+++ b/instrumentation/jsp-2.3/jsp-2.3.gradle
@@ -22,7 +22,7 @@ dependencies {
   compileOnly group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.0'
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
 
-  testCompile project(':instrumentation:servlet:request-3.0')
+  testCompile project(':instrumentation:servlet:servlet-3.0')
   // using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37
   // https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in
   testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37'
diff --git a/instrumentation/rabbitmq-amqp-2.7/rabbitmq-amqp-2.7.gradle b/instrumentation/rabbitmq-2.7/rabbitmq-2.7.gradle
similarity index 100%
rename from instrumentation/rabbitmq-amqp-2.7/rabbitmq-amqp-2.7.gradle
rename to instrumentation/rabbitmq-2.7/rabbitmq-2.7.gradle
diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
similarity index 100%
rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java
diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
similarity index 100%
rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java
diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java
similarity index 100%
rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java
rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java
diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java
similarity index 100%
rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java
rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java
diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java
similarity index 100%
rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java
rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java
diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java
similarity index 100%
rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java
rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java
diff --git a/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy b/instrumentation/rabbitmq-2.7/src/test/groovy/RabbitMQTest.groovy
similarity index 100%
rename from instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy
rename to instrumentation/rabbitmq-2.7/src/test/groovy/RabbitMQTest.groovy
diff --git a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle
index 28f42af7ec88..b8df8997eba1 100644
--- a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle
+++ b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle
@@ -1,10 +1,12 @@
 ext {
   maxJavaVersionForTests = JavaVersion.VERSION_1_8
+  skipPublish = true
 }
 
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
+
 testSets {
   latestDepTest {
     dirName = 'test'
@@ -12,7 +14,7 @@ testSets {
 }
 
 dependencies {
-  testCompile project(':instrumentation:servlet:request-3.0')
+  testCompile project(':instrumentation:servlet:servlet-3.0')
   testCompile project(':instrumentation:grizzly-2.0')
 
   testCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0'
diff --git a/instrumentation/servlet/request-2.3/request-2.3.gradle b/instrumentation/servlet/servlet-2.3/servlet-2.3.gradle
similarity index 100%
rename from instrumentation/servlet/request-2.3/request-2.3.gradle
rename to instrumentation/servlet/servlet-2.3/servlet-2.3.gradle
diff --git a/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java
similarity index 100%
rename from instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java
rename to instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java
diff --git a/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java
similarity index 100%
rename from instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java
rename to instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java
diff --git a/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java
similarity index 100%
rename from instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java
rename to instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java
diff --git a/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java
similarity index 100%
rename from instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java
rename to instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java
diff --git a/instrumentation/servlet/request-2.3/src/test/groovy/JettyServlet2Test.groovy b/instrumentation/servlet/servlet-2.3/src/test/groovy/JettyServlet2Test.groovy
similarity index 100%
rename from instrumentation/servlet/request-2.3/src/test/groovy/JettyServlet2Test.groovy
rename to instrumentation/servlet/servlet-2.3/src/test/groovy/JettyServlet2Test.groovy
diff --git a/instrumentation/servlet/request-2.3/src/test/groovy/ServletTestInstrumentation.java b/instrumentation/servlet/servlet-2.3/src/test/groovy/ServletTestInstrumentation.java
similarity index 100%
rename from instrumentation/servlet/request-2.3/src/test/groovy/ServletTestInstrumentation.java
rename to instrumentation/servlet/servlet-2.3/src/test/groovy/ServletTestInstrumentation.java
diff --git a/instrumentation/servlet/request-2.3/src/test/groovy/TestServlet2.groovy b/instrumentation/servlet/servlet-2.3/src/test/groovy/TestServlet2.groovy
similarity index 100%
rename from instrumentation/servlet/request-2.3/src/test/groovy/TestServlet2.groovy
rename to instrumentation/servlet/servlet-2.3/src/test/groovy/TestServlet2.groovy
diff --git a/instrumentation/servlet/request-2.3/src/test/resources/realm.properties b/instrumentation/servlet/servlet-2.3/src/test/resources/realm.properties
similarity index 100%
rename from instrumentation/servlet/request-2.3/src/test/resources/realm.properties
rename to instrumentation/servlet/servlet-2.3/src/test/resources/realm.properties
diff --git a/instrumentation/servlet/request-3.0/request-3.0.gradle b/instrumentation/servlet/servlet-3.0/servlet-3.0.gradle
similarity index 100%
rename from instrumentation/servlet/request-3.0/request-3.0.gradle
rename to instrumentation/servlet/servlet-3.0/servlet-3.0.gradle
diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java
rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java
diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java
rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java
diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java
rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java
diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java
rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java
diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java
rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java
diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/AbstractServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/AbstractServlet3Test.groovy
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/test/groovy/AbstractServlet3Test.groovy
rename to instrumentation/servlet/servlet-3.0/src/test/groovy/AbstractServlet3Test.groovy
diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/JettyServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/JettyServlet3Test.groovy
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/test/groovy/JettyServlet3Test.groovy
rename to instrumentation/servlet/servlet-3.0/src/test/groovy/JettyServlet3Test.groovy
diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/JettyServletHandlerTest.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/JettyServletHandlerTest.groovy
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/test/groovy/JettyServletHandlerTest.groovy
rename to instrumentation/servlet/servlet-3.0/src/test/groovy/JettyServletHandlerTest.groovy
diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/RequestDispatcherServlet.java b/instrumentation/servlet/servlet-3.0/src/test/groovy/RequestDispatcherServlet.java
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/test/groovy/RequestDispatcherServlet.java
rename to instrumentation/servlet/servlet-3.0/src/test/groovy/RequestDispatcherServlet.java
diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/ServletTestInstrumentation.java b/instrumentation/servlet/servlet-3.0/src/test/groovy/ServletTestInstrumentation.java
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/test/groovy/ServletTestInstrumentation.java
rename to instrumentation/servlet/servlet-3.0/src/test/groovy/ServletTestInstrumentation.java
diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/TestServlet3.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/TestServlet3.groovy
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/test/groovy/TestServlet3.groovy
rename to instrumentation/servlet/servlet-3.0/src/test/groovy/TestServlet3.groovy
diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/TomcatServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/TomcatServlet3Test.groovy
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/test/groovy/TomcatServlet3Test.groovy
rename to instrumentation/servlet/servlet-3.0/src/test/groovy/TomcatServlet3Test.groovy
diff --git a/instrumentation/servlet/request-3.0/src/test/resources/realm.properties b/instrumentation/servlet/servlet-3.0/src/test/resources/realm.properties
similarity index 100%
rename from instrumentation/servlet/request-3.0/src/test/resources/realm.properties
rename to instrumentation/servlet/servlet-3.0/src/test/resources/realm.properties
diff --git a/instrumentation/servlet/servlet.gradle b/instrumentation/servlet/servlet.gradle
index 4fa261f81411..1216315b5b54 100644
--- a/instrumentation/servlet/servlet.gradle
+++ b/instrumentation/servlet/servlet.gradle
@@ -22,7 +22,7 @@ dependencies {
   testCompile group: 'javax.servlet', name: 'servlet-api', version: '2.3'
 
   // servlet request instrumentation required for linking request to response.
-  testCompile project(':instrumentation:servlet:request-2.3')
+  testCompile project(':instrumentation:servlet:servlet-2.3')
 
   // Don't want to conflict with jetty from the test server.
   testImplementation(project(':testing')) {
diff --git a/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle b/instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle
similarity index 100%
rename from instrumentation/sparkjava-2.3/sparkjava-2.3.gradle
rename to instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle
diff --git a/instrumentation/sparkjava-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java b/instrumentation/spark-web-framework-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java
similarity index 100%
rename from instrumentation/sparkjava-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java
rename to instrumentation/spark-web-framework-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java
diff --git a/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy b/instrumentation/spark-web-framework-2.3/src/test/groovy/SparkJavaBasedTest.groovy
similarity index 100%
rename from instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy
rename to instrumentation/spark-web-framework-2.3/src/test/groovy/SparkJavaBasedTest.groovy
diff --git a/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java b/instrumentation/spark-web-framework-2.3/src/test/java/TestSparkJavaApplication.java
similarity index 100%
rename from instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java
rename to instrumentation/spark-web-framework-2.3/src/test/java/TestSparkJavaApplication.java
diff --git a/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle b/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle
index 579a0fcff054..262d3fb6c48e 100644
--- a/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle
+++ b/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle
@@ -33,7 +33,7 @@ dependencies {
 
   // Include servlet instrumentation for verifying the tomcat requests
   testCompile project(':instrumentation:servlet')
-  testCompile project(':instrumentation:servlet:request-3.0')
+  testCompile project(':instrumentation:servlet:servlet-3.0')
 
   testCompile group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final'
   testCompile group: 'org.hibernate', name: 'hibernate-validator', version: '5.4.2.Final'
diff --git a/load-generator/load-generator.gradle b/load-generator/load-generator.gradle
index 93a21bf428ff..adc56f4bba65 100644
--- a/load-generator/load-generator.gradle
+++ b/load-generator/load-generator.gradle
@@ -8,11 +8,11 @@ dependencies {
 }
 
 task launch(type: JavaExec) {
-  dependsOn ':opentelemetry-auto:shadowJar'
+  dependsOn ':opentelemetry-javaagent:shadowJar'
   doFirst {
     classpath = sourceSets.main.runtimeClasspath
     main = 'io.opentelemetry.loadgenerator.LoadGenerator'
-    jvmArgs = ["-javaagent:${project(':opentelemetry-auto').shadowJar.archivePath}"]
+    jvmArgs = ["-javaagent:${project(':opentelemetry-javaagent').shadowJar.archivePath}"]
     systemProperties System.properties
   }
 }
diff --git a/java-agent/README.md b/opentelemetry-javaagent/README.md
similarity index 100%
rename from java-agent/README.md
rename to opentelemetry-javaagent/README.md
diff --git a/java-agent/java-agent.gradle b/opentelemetry-javaagent/opentelemetry-javaagent.gradle
similarity index 98%
rename from java-agent/java-agent.gradle
rename to opentelemetry-javaagent/opentelemetry-javaagent.gradle
index 4e4d6c250fc7..4c313bba09cf 100644
--- a/java-agent/java-agent.gradle
+++ b/opentelemetry-javaagent/opentelemetry-javaagent.gradle
@@ -4,7 +4,7 @@ plugins {
   id "com.github.johnrengelman.shadow"
 }
 
-description = 'opentelemetry-auto'
+description = 'Auto instrumentation agent'
 
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
@@ -46,7 +46,6 @@ shadowJar {
 
 //Includes instrumentations, but not exporters
 task lightShadow(type: ShadowJar) {
-  archiveClassifier = ''
   from sourceSets.main.output
 
   def sourceTasks = [project(':instrumentation').tasks.shadowJar]
@@ -61,6 +60,7 @@ publishing {
     }
   }
 }
+
 tasks.withType(ShadowJar).configureEach {
   configurations = [project.configurations.shadowInclude]
   mergeServiceFiles()
diff --git a/java-agent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java b/opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java
similarity index 99%
rename from java-agent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java
rename to opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java
index d7ae0b662480..24355e229f53 100644
--- a/java-agent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java
+++ b/opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java
@@ -224,7 +224,7 @@ public static String getAgentVersion() throws IOException {
     try (final BufferedReader reader =
         new BufferedReader(
             new InputStreamReader(
-                thisClass.getResourceAsStream("/opentelemetry-auto.version"),
+                thisClass.getResourceAsStream("/opentelemetry-javaagent.version"),
                 StandardCharsets.UTF_8))) {
 
       for (int c = reader.read(); c != -1; c = reader.read()) {
diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy
similarity index 100%
rename from java-agent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy
rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy
diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy
similarity index 100%
rename from java-agent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy
rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy
diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy
similarity index 100%
rename from java-agent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy
rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy
diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy
similarity index 100%
rename from java-agent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy
rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy
diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy
similarity index 100%
rename from java-agent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy
rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy
diff --git a/java-agent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java b/opentelemetry-javaagent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java
similarity index 100%
rename from java-agent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java
rename to opentelemetry-javaagent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java
diff --git a/java-agent/src/test/java/io/opentelemetry/test/ClassToInstrument.java b/opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java
similarity index 100%
rename from java-agent/src/test/java/io/opentelemetry/test/ClassToInstrument.java
rename to opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java
diff --git a/java-agent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java b/opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java
similarity index 100%
rename from java-agent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java
rename to opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java
diff --git a/java-agent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java b/opentelemetry-javaagent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java
similarity index 100%
rename from java-agent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java
rename to opentelemetry-javaagent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java
diff --git a/java-agent/src/test/java/jvmbootstraptest/LogLevelChecker.java b/opentelemetry-javaagent/src/test/java/jvmbootstraptest/LogLevelChecker.java
similarity index 100%
rename from java-agent/src/test/java/jvmbootstraptest/LogLevelChecker.java
rename to opentelemetry-javaagent/src/test/java/jvmbootstraptest/LogLevelChecker.java
diff --git a/java-agent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java b/opentelemetry-javaagent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java
similarity index 100%
rename from java-agent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java
rename to opentelemetry-javaagent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java
diff --git a/java-agent/src/test/resources/logback.xml b/opentelemetry-javaagent/src/test/resources/logback.xml
similarity index 100%
rename from java-agent/src/test/resources/logback.xml
rename to opentelemetry-javaagent/src/test/resources/logback.xml
diff --git a/settings.gradle b/settings.gradle
index 89cc0c9d9152..07e0051aec92 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,7 @@ gradleEnterprise {
 rootProject.name = 'opentelemetry-java-instrumentation'
 
 // agent projects
-include ':java-agent'
+include ':opentelemetry-javaagent'
 include ':opentelemetry-sdk-shaded-for-testing'
 include ':opentelemetry-api-beta-shaded-for-instrumenting'
 include ':logback-shaded-for-instrumenting'
@@ -74,10 +74,10 @@ include ':instrumentation:hibernate:hibernate-4.3'
 include ':instrumentation:hibernate:hibernate-common'
 include ':instrumentation:http-url-connection'
 include ':instrumentation:hystrix-1.4'
-include ':instrumentation:java-class-loader'
-include ':instrumentation:java-class-loader:jboss-testing'
-include ':instrumentation:java-class-loader:osgi-testing'
-include ':instrumentation:java-class-loader:tomcat-testing'
+include ':instrumentation:java-classloader'
+include ':instrumentation:java-classloader:jboss-testing'
+include ':instrumentation:java-classloader:osgi-testing'
+include ':instrumentation:java-classloader:tomcat-testing'
 include ':instrumentation:java-concurrent'
 include ':instrumentation:java-concurrent:java-completablefuture'
 include ':instrumentation:java-concurrent:kotlin-testing'
@@ -126,7 +126,7 @@ include ':instrumentation:play-ws:play-ws-1.0'
 include ':instrumentation:play-ws:play-ws-2.0'
 include ':instrumentation:play-ws:play-ws-2.1'
 include ':instrumentation:play-ws:play-ws-common'
-include ':instrumentation:rabbitmq-amqp-2.7'
+include ':instrumentation:rabbitmq-2.7'
 include ':instrumentation:ratpack-1.5'
 include ':instrumentation:reactor-3.1'
 include ':instrumentation:rediscala-1.8'
@@ -135,11 +135,11 @@ include ':instrumentation:rxjava-1.0'
 include ':instrumentation:servlet'
 include ':instrumentation:servlet:glassfish-testing'
 include ':instrumentation:servlet:servlet-common'
-include ':instrumentation:servlet:request-2.3'
-include ':instrumentation:servlet:request-3.0'
+include ':instrumentation:servlet:servlet-2.3'
+include ':instrumentation:servlet:servlet-3.0'
 // FIXME this instrumentation relied on scope listener
 // include ':instrumentation:slf4j-mdc'
-include ':instrumentation:sparkjava-2.3'
+include ':instrumentation:spark-web-framework-2.3'
 include ':instrumentation:spring-data-1.8'
 include ':instrumentation:spring-scheduling-3.1'
 include ':instrumentation:spring-webmvc-3.1'
@@ -179,7 +179,6 @@ rootProject.children.each {
 
 project(':agent-bootstrap').name = 'auto-bootstrap'
 project(':agent-tooling').name = 'auto-tooling'
-project(':java-agent').name = 'opentelemetry-auto'
 project(':auto-exporters:jaeger').name = 'opentelemetry-auto-exporter-jaeger'
 project(':auto-exporters:logging').name = 'opentelemetry-auto-exporter-logging'
 project(':auto-exporters:otlp').name = 'opentelemetry-auto-exporter-otlp'
diff --git a/smoke-tests/smoke-tests.gradle b/smoke-tests/smoke-tests.gradle
index 83796788b028..7fbcd49bec03 100644
--- a/smoke-tests/smoke-tests.gradle
+++ b/smoke-tests/smoke-tests.gradle
@@ -12,12 +12,12 @@ dependencies {
 
 subprojects { subProject ->
   subProject.tasks.withType(Test).configureEach {
-    dependsOn = [':opentelemetry-auto:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar']
+    dependsOn = [':opentelemetry-javaagent:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar']
 
     doFirst {
       // Tests depend on this to know where to run things and what agent jar to use
       jvmArgs "-Dio.opentelemetry.smoketest.builddir=${buildDir}"
-      jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-auto').tasks.shadowJar.archivePath}"
+      jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-javaagent').tasks.shadowJar.archivePath}"
       jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath}"
     }
   }