diff --git a/buildscripts/checkstyle.xml b/buildscripts/checkstyle.xml
index a3a4ff7d3512..72f15023f18e 100644
--- a/buildscripts/checkstyle.xml
+++ b/buildscripts/checkstyle.xml
@@ -405,7 +405,7 @@
   
   
     
-    
+    
     
   
diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
index 4a5b87c0e2e4..07165f789707 100644
--- a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
+++ b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
@@ -104,8 +104,8 @@ afterEvaluate {
     val agentShadowJar = agentForTesting.resolve().first()
 
     dependsOn(shadowJar)
-    // TODO(anuraaga): Figure out why dependsOn override is still needed in otel.javaagent-testing
-    // despite this dependency.
+    // TODO: Figure out why dependsOn override is still needed in otel.javaagent-testing despite
+    // this dependency.
     dependsOn(agentForTesting.buildDependencies)
 
     jvmArgumentProviders.add(JavaagentTestArgumentsProvider(agentShadowJar, shadowJar.archiveFile.get().asFile))
@@ -119,8 +119,8 @@ afterEvaluate {
         return@filter false
       }
 
-      // TODO(anuraaga): Better not to have this naming constraint, we can likely use
-      // plugin identification instead.
+      // TODO: Better not to have this naming constraint, we can likely use plugin identification
+      // instead.
 
       val lib = it.absoluteFile
       if (lib.name.startsWith("opentelemetry-javaagent-")) {
diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
index 2129bc956a2b..95320c61d39a 100644
--- a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
+++ b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -90,7 +90,7 @@ tasks {
         disable("TypeParameterNaming")
 
         // In bytecode instrumentation it's very common to separate across onEnter / onExit
-        // TODO(anuraaga): Only disable for javaagent instrumentation modules.
+        // TODO: Only disable for javaagent instrumentation modules.
         disable("MustBeClosedChecker")
 
         // Common to avoid an allocation. Revisit if it's worth opt-in suppressing instead of
@@ -101,16 +101,15 @@ tasks {
         disable("JdkObsolete")
         disable("JavaUtilDate")
 
-        // TODO(anuraaga): Remove this, we use this pattern in several tests and it will mean
-        // some moving.
+        // TODO: Remove this, we use this pattern in several tests and it will mean some moving.
         disable("DefaultPackage")
 
         // we use modified Otel* checks which ignore *Advice classes
         disable("PrivateConstructorForUtilityClass")
         disable("CanIgnoreReturnValueSuggester")
 
-        // TODO(anuraaga): Remove this, probably after instrumenter API migration instead of dealing
-        // with older APIs.
+        // TODO: Remove this, probably after instrumenter API migration instead of dealing with
+        // older APIs.
         disable("InconsistentOverloads")
 
         // lots of low level APIs use arrays
diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts
index 576aed6cd7c4..3f44ff69011e 100644
--- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts
+++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -342,7 +342,7 @@ tasks.withType().configureEach {
   // There's no real harm in setting this for all tests even if any happen to not be using context
   // propagation.
   jvmArgs("-Dio.opentelemetry.context.enableStrictContext=${rootProject.findProperty("enableStrictContext") ?: true}")
-  // TODO(anuraaga): Have agent map unshaded to shaded.
+  // TODO: Have agent map unshaded to shaded.
   if (project.findProperty("disableShadowRelocate") != "true") {
     jvmArgs("-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=${rootProject.findProperty("enableStrictContext") ?: true}")
   } else {
diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
index 7029b90da9b9..ac68cd11191e 100644
--- a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
+++ b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
@@ -158,8 +158,7 @@ protected Collection waitForTraces()
         .map(
             it -> {
               ExportTraceServiceRequest.Builder builder = ExportTraceServiceRequest.newBuilder();
-              // TODO(anuraaga): Register parser into object mapper to avoid de -> re ->
-              // deserialize.
+              // TODO: Register parser into object mapper to avoid de -> re -> deserialize.
               try {
                 JsonFormat.parser().merge(OBJECT_MAPPER.writeValueAsString(it), builder);
               } catch (InvalidProtocolBufferException | JsonProcessingException e) {
diff --git a/instrumentation/armeria/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java b/instrumentation/armeria/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java
index a7a9504f10ee..bddb5f4a24bf 100644
--- a/instrumentation/armeria/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java
+++ b/instrumentation/armeria/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java
@@ -180,8 +180,8 @@ protected void configure(HttpServerTestOptions options) {
     options.setExpectedHttpRoute(
         (endpoint, method) -> {
           if (endpoint == ServerEndpoint.NOT_FOUND) {
-            // TODO(anuraaga): Revisit this when applying instrumenters to more libraries, Armeria
-            // currently reports '/*' which is a fallback route.
+            // TODO: Revisit this when applying instrumenters to more libraries, Armeria currently
+            // reports '/*' which is a fallback route.
             return "/*";
           }
           return expectedHttpRoute(endpoint, method);
diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ApiGatewayProxyRequest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ApiGatewayProxyRequest.java
index a96fa5e3f90b..1582ee649e81 100644
--- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ApiGatewayProxyRequest.java
+++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ApiGatewayProxyRequest.java
@@ -25,8 +25,8 @@ public abstract class ApiGatewayProxyRequest {
 
   private static final Logger logger = Logger.getLogger(ApiGatewayProxyRequest.class.getName());
 
-  // TODO(anuraaga): We should create a RequestFactory type of class instead of evaluating this
-  // for every request.
+  // TODO: We should create a RequestFactory type of class instead of evaluating this for every
+  // request.
   private static boolean noHttpPropagationNeeded() {
     Collection fields =
         GlobalOpenTelemetry.getPropagators().getTextMapPropagator().fields();
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts
index 452d42189590..02122a052bc4 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
   // We need Jackson for wrappers to reproduce the serialization does when Lambda invokes a RequestHandler with event
   // since Lambda will only be able to invoke the wrapper itself with a generic Object.
   // Note that Lambda itself uses Jackson, but does not expose it to the function so we need to include it here.
-  // TODO(anuraaga): Switch to aws-lambda-java-serialization to more robustly follow Lambda's serialization logic.
+  // TODO: Switch to aws-lambda-java-serialization to more robustly follow Lambda's serialization logic.
   implementation("com.fasterxml.jackson.core:jackson-databind")
   implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
 
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy
index 2533a0202dac..c571c0aa9cf9 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy
@@ -408,7 +408,7 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest {
       """
   }
 
-  // TODO(anuraaga): Without AOP instrumentation of the HTTP client, we cannot model retries as
+  // TODO: Without AOP instrumentation of the HTTP client, we cannot model retries as
   // spans because of https://github.com/aws/aws-sdk-java-v2/issues/1741. We should at least tweak
   // the instrumentation to add Events for retries instead.
   def "timeout and retry errors not captured"() {
diff --git a/instrumentation/finatra-2.9/javaagent/build.gradle.kts b/instrumentation/finatra-2.9/javaagent/build.gradle.kts
index 4cb1cbaab917..1c328124bfbe 100644
--- a/instrumentation/finatra-2.9/javaagent/build.gradle.kts
+++ b/instrumentation/finatra-2.9/javaagent/build.gradle.kts
@@ -28,8 +28,7 @@ val finatraLatest by configurations.creating {
 }
 
 dependencies {
-  // TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
-  // here.
+  // TODO: Something about library configuration doesn't work well with scala compilation here.
   compileOnly("com.twitter:finatra-http_2.11:2.9.0")
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/RequestBuilderHeaderSetter.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/RequestBuilderHeaderSetter.java
index 248203c92f73..a199bf2c460f 100644
--- a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/RequestBuilderHeaderSetter.java
+++ b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/RequestBuilderHeaderSetter.java
@@ -10,7 +10,7 @@
 import okhttp3.Request;
 
 /** Helper class to inject span context into request headers. */
-// TODO(anuraaga): Figure out a way to avoid copying this from okhttp instrumentation.
+// TODO: Figure out a way to avoid copying this from okhttp instrumentation.
 enum RequestBuilderHeaderSetter implements TextMapSetter {
   INSTANCE;
 
diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java
index 4324b7cc1199..4f2b40813ed6 100644
--- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java
+++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java
@@ -38,8 +38,8 @@ protected RedisClient createClient(String uri) {
     return RedisClient.create(uri);
   }
 
-  // TODO(anuraaga): reactor library instrumentation doesn't seem to handle this case, figure out if
-  // it should and if so move back to base class.
+  // TODO: reactor library instrumentation doesn't seem to handle this case, figure out if it
+  // should and if so move back to base class.
   @SuppressWarnings("deprecation") // using deprecated semconv
   @Test
   void testAsyncSubscriberWithSpecificThreadPool() {
diff --git a/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java b/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java
index 6b8d10f1309d..33237a69845a 100644
--- a/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java
+++ b/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java
@@ -112,7 +112,7 @@ public void sendRequestWithCallback(
 
     // TODO: context is not automatically propagated into callbacks
     Context context = Context.current();
-    // TODO(anuraaga): Do we also need to test ListenableFuture callback?
+    // TODO: Do we also need to test ListenableFuture callback?
     client.executeRequest(
         request,
         new AsyncCompletionHandler() {
diff --git a/instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractProcessMetricsTest.java b/instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractProcessMetricsTest.java
index 03edfe6d279d..7a4f043eb297 100644
--- a/instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractProcessMetricsTest.java
+++ b/instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractProcessMetricsTest.java
@@ -31,7 +31,7 @@ void test() {
                     metric ->
                         assertThat(metric)
                             .hasUnit("By")
-                            // TODO(anuraaga): Provide fuzzy value matching
+                            // TODO: Provide fuzzy value matching
                             .hasLongSumSatisfying(
                                 sum ->
                                     assertThat(metric.getLongSumData().getPoints())
@@ -46,7 +46,7 @@ void test() {
                     metric ->
                         assertThat(metric)
                             .hasUnit("ms")
-                            // TODO(anuraaga): Provide fuzzy value matching
+                            // TODO: Provide fuzzy value matching
                             .hasLongGaugeSatisfying(
                                 gauge ->
                                     assertThat(metric.getLongGaugeData().getPoints())
diff --git a/instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractSystemMetricsTest.java b/instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractSystemMetricsTest.java
index d62ee8e6cfe0..4dd76cf80fdd 100644
--- a/instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractSystemMetricsTest.java
+++ b/instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractSystemMetricsTest.java
@@ -31,7 +31,7 @@ public void test() {
                     metric ->
                         assertThat(metric)
                             .hasUnit("By")
-                            // TODO(anuraaga): Provide fuzzy value matching
+                            // TODO: Provide fuzzy value matching
                             .hasLongSumSatisfying(
                                 sum ->
                                     assertThat(metric.getLongSumData().getPoints())
@@ -46,7 +46,7 @@ public void test() {
                     metric ->
                         assertThat(metric)
                             .hasUnit("1")
-                            // TODO(anuraaga): Provide fuzzy value matching
+                            // TODO: Provide fuzzy value matching
                             .hasDoubleGaugeSatisfying(
                                 gauge ->
                                     assertThat(metric.getDoubleGaugeData().getPoints())
diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
index ebe736e79fa5..52d40b6dd052 100644
--- a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
+++ b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
@@ -35,8 +35,7 @@ otelJava {
 }
 
 dependencies {
-  // TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
-  // here.
+  // TODO: Something about library configuration doesn't work well with scala compilation here.
   compileOnly("com.typesafe.play:play_$scalaVersion:$playVersion")
 
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
diff --git a/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/TracingJobListener.java b/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/TracingJobListener.java
index 9786ca28cfe5..31078a46cd1a 100644
--- a/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/TracingJobListener.java
+++ b/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/TracingJobListener.java
@@ -31,7 +31,7 @@ public String getName() {
 
   @Override
   public void jobExecutionVetoed(JobExecutionContext jobExecutionContext) {
-    // TODO(anuraaga): Consider adding an attribute for vetoed jobs.
+    // TODO: Consider adding an attribute for vetoed jobs.
   }
 
   @Override
diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java b/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java
index c3fbe44074d8..c2828217f2be 100644
--- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java
+++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java
@@ -266,7 +266,7 @@ public void onComplete() {
         });
   }
 
-  // TODO(anuraaga): The default Ratpack error handler also returns a 500 which is all we test, so
+  // TODO: The default Ratpack error handler also returns a 500 which is all we test, so
   // we don't actually have test coverage ensuring our instrumentation correctly delegates to this
   // user registered handler.
   private static class TestErrorHandler implements ServerErrorHandler {
diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/testInitialization/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/InitializationTest.java b/instrumentation/reactor/reactor-3.1/javaagent/src/testInitialization/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/InitializationTest.java
index 77f5a44b89b9..40168476f589 100644
--- a/instrumentation/reactor/reactor-3.1/javaagent/src/testInitialization/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/InitializationTest.java
+++ b/instrumentation/reactor/reactor-3.1/javaagent/src/testInitialization/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/InitializationTest.java
@@ -23,7 +23,7 @@ void contextPropagated() {
 
     // If reactor augmentation of WithSpan is working correctly, we will end up with these
     // implementation details.
-    // TODO(anuraaga): This should just check actual context propagation instead of implementation
+    // TODO: This should just check actual context propagation instead of implementation
     // but couldn't figure out how.
     assertThat(((Scannable) mono).parents().collect(Collectors.toList()))
         .anySatisfy(
diff --git a/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJavaPluginsInstrumentation.java b/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJavaPluginsInstrumentation.java
index 58f4119835d3..25b3e4e7b08a 100644
--- a/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJavaPluginsInstrumentation.java
+++ b/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJavaPluginsInstrumentation.java
@@ -30,7 +30,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class MethodAdvice {
 
-    // TODO(anuraaga): Replace with adding a type initializer to RxJavaPlugins
+    // TODO: Replace with adding a type initializer to RxJavaPlugins
     // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2685
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void activateOncePerClassloader() {
diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJavaPluginsInstrumentation.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJavaPluginsInstrumentation.java
index 4b8a72f30d01..9d20a17c12c6 100644
--- a/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJavaPluginsInstrumentation.java
+++ b/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJavaPluginsInstrumentation.java
@@ -30,7 +30,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class MethodAdvice {
 
-    // TODO(anuraaga): Replace with adding a type initializer to RxJavaPlugins
+    // TODO: Replace with adding a type initializer to RxJavaPlugins
     // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2685
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void activateOncePerClassloader() {
diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJavaPluginsInstrumentation.java b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJavaPluginsInstrumentation.java
index 7d2847b23f8f..c29740bf75db 100644
--- a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJavaPluginsInstrumentation.java
+++ b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJavaPluginsInstrumentation.java
@@ -30,7 +30,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class MethodAdvice {
 
-    // TODO(anuraaga): Replace with adding a type initializer to RxJavaPlugins
+    // TODO: Replace with adding a type initializer to RxJavaPlugins
     // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2685
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void activateOncePerClassloader() {
diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts
index 1f318ac0f203..b5d669f48389 100644
--- a/javaagent-tooling/build.gradle.kts
+++ b/javaagent-tooling/build.gradle.kts
@@ -127,7 +127,7 @@ tasks {
 
 // Mockito inline mocking uses byte-buddy but agent tooling currently uses byte-buddy-dep, which cannot be on the same
 // classpath. Disable inline mocking to prevent conflicts.
-// TODO(anuraaga): Find a better solution
+// TODO: Find a better solution
 configurations {
   testRuntimeClasspath {
     dependencies {
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy
index 40d2126626d2..d8eb9cbf174b 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy
@@ -47,7 +47,7 @@ class TelemetryRetriever {
 
     return OBJECT_MAPPER.readTree(content).collect {
       def builder = builderConstructor.get()
-      // TODO(anuraaga): Register parser into object mapper to avoid de -> re -> deserialize.
+      // TODO: Register parser into object mapper to avoid de -> re -> deserialize.
       JsonFormat.parser().merge(OBJECT_MAPPER.writeValueAsString(it), builder)
       return (T) builder.build()
     }
diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java
index 8f68cce5c084..15d197f9b57e 100644
--- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java
+++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java
@@ -131,7 +131,7 @@ private > void waitAndAssertTraces(
         // Don't throw this failure since the stack is the awaitility thread, causing confusion.
         // Instead, just assert one more time on the test thread, which will fail with a better
         // stack trace.
-        // TODO(anuraaga): There is probably a better way to do this.
+        // TODO: There is probably a better way to do this.
         doAssertTraces(traceComparator, assertionsList, verifyScopeVersion);
       } else {
         throw t;
diff --git a/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java b/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java
index ffe8996ae0e8..555315ca11d8 100644
--- a/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java
+++ b/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java
@@ -350,7 +350,7 @@ private static MetricData createMetricData(
               metric.getName(),
               metric.getDescription(),
               metric.getUnit(),
-              // TODO(anuraaga): Remove usages of internal types.
+              // TODO: Remove usages of internal types.
               ImmutableGaugeData.create(
                   getDoublePointDatas(metric.getGauge().getDataPointsList())));
         } else {