diff --git a/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java b/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
index 9cbe38451..6ddf537ee 100644
--- a/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
+++ b/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
@@ -201,7 +201,7 @@ private static String deepToString(Object obj) {
     if (obj.getClass().isArray()) {
       return String.format(
           "(%s[]) %s",
-          obj.getClass().getComponentType().getName(), Arrays.deepToString((Object[]) obj));
+          obj.getClass().getComponentType().getTypeName(), Arrays.deepToString((Object[]) obj));
     }
     return obj.toString();
   }
diff --git a/src/main/java/com/code_intelligence/jazzer/junit/FuzzTestExtensions.java b/src/main/java/com/code_intelligence/jazzer/junit/FuzzTestExtensions.java
index 7de39b2cd..8036d6c16 100644
--- a/src/main/java/com/code_intelligence/jazzer/junit/FuzzTestExtensions.java
+++ b/src/main/java/com/code_intelligence/jazzer/junit/FuzzTestExtensions.java
@@ -145,7 +145,7 @@ private void recordSeedForFuzzing(List<Object> arguments, ExtensionContext exten
       String argumentTypes =
           arguments.stream()
               .filter(Objects::nonNull)
-              .map(obj -> obj.getClass().getName())
+              .map(obj -> obj.getClass().getTypeName())
               .collect(Collectors.joining(","));
       String argumentValues =
           arguments.stream()
diff --git a/src/main/java/com/code_intelligence/jazzer/mutation/mutator/proto/TypeLibrary.java b/src/main/java/com/code_intelligence/jazzer/mutation/mutator/proto/TypeLibrary.java
index 3bc71b304..1b427e31e 100644
--- a/src/main/java/com/code_intelligence/jazzer/mutation/mutator/proto/TypeLibrary.java
+++ b/src/main/java/com/code_intelligence/jazzer/mutation/mutator/proto/TypeLibrary.java
@@ -178,7 +178,7 @@ static Message getDefaultInstance(WithDefaultInstance withDefaultInstance) {
                   + " subtype of %s, got %s",
               withDefaultInstance.value(),
               Message.class.getName(),
-              method.getReturnType().getName()));
+              method.getReturnType().getTypeName()));
     }
 
     try {
diff --git a/src/main/java/com/code_intelligence/jazzer/mutation/support/AnnotationSupport.java b/src/main/java/com/code_intelligence/jazzer/mutation/support/AnnotationSupport.java
index d4f19c001..7f0212e7b 100644
--- a/src/main/java/com/code_intelligence/jazzer/mutation/support/AnnotationSupport.java
+++ b/src/main/java/com/code_intelligence/jazzer/mutation/support/AnnotationSupport.java
@@ -70,20 +70,20 @@ private static void ensureDeepAppliesTo(Annotation annotation, Class<?> clazz) {
 
     String helpText = "";
     if (appliesTo.value().length != 0) {
-      helpText = stream(appliesTo.value()).map(Class::getName).collect(joining(", "));
+      helpText = stream(appliesTo.value()).map(Class::getTypeName).collect(joining(", "));
     }
     if (appliesTo.subClassesOf().length != 0) {
       if (!helpText.isEmpty()) {
         helpText += " as well as ";
       }
       helpText += "subclasses of ";
-      helpText += stream(appliesTo.subClassesOf()).map(Class::getName).collect(joining(", "));
+      helpText += stream(appliesTo.subClassesOf()).map(Class::getTypeName).collect(joining(", "));
     }
     // Use the simple name as our annotations live in a single package.
     throw new IllegalArgumentException(
         format(
             "@%s does not apply to %s, only applies to %s",
-            annotation.annotationType().getSimpleName(), clazz.getName(), helpText));
+            annotation.annotationType().getSimpleName(), clazz.getTypeName(), helpText));
   }
 
   private static void ensureMinLessThanOrEqualsMax(Annotation annotation) {
diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
index 88df62574..1290e3e3d 100644
--- a/tests/BUILD.bazel
+++ b/tests/BUILD.bazel
@@ -1045,7 +1045,7 @@ java_fuzz_target_test(
     srcs = ["src/test/java/com/example/InvalidMutatorTest.java"],
     expect_crash = False,
     expect_non_crash_exit_code = 1,
-    expected_warning_or_error = "ERROR: @UrlSegment does not apply to java.lang.Integer, only applies to java.lang.String",
+    expected_warning_or_error = "ERROR: @UrlSegment does not apply to java.lang.Integer\\[\\], only applies to java.lang.String",
     target_class = "com.example.InvalidMutatorTest",
     target_method = "invalidAnnotation",
     runtime_deps = [
diff --git a/tests/src/test/java/com/example/InvalidMutatorTest.java b/tests/src/test/java/com/example/InvalidMutatorTest.java
index 36cd251ae..7b88cae07 100644
--- a/tests/src/test/java/com/example/InvalidMutatorTest.java
+++ b/tests/src/test/java/com/example/InvalidMutatorTest.java
@@ -27,7 +27,7 @@ public void invalidParameter(System ignored) {
   }
 
   @FuzzTest
-  public void invalidAnnotation(@UrlSegment Integer ignored) {
+  public void invalidAnnotation(Integer @UrlSegment [] ignored) {
     throw new IllegalStateException("This method should not be executed");
   }
 }