diff --git a/java/java-tests/testData/inspection/invokeHandleSignature/Constructor.java b/java/java-tests/testData/inspection/invokeHandleSignature/Constructor.java
index 404a11c958a9..652d80d7f446 100644
--- a/java/java-tests/testData/inspection/invokeHandleSignature/Constructor.java
+++ b/java/java-tests/testData/inspection/invokeHandleSignature/Constructor.java
@@ -15,9 +15,9 @@ class Main {
     l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'int Test()'">MethodType.methodType(int.class)</warning>);
     l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'Test Test()'">MethodType.methodType(Test.class)</warning>);
     l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'Test Test(int)'">MethodType.methodType(Test.class, int.class)</warning>);
-    l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'Test(java.lang.String)'">MethodType.methodType(void.class, String.class)</warning>);
-    l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'Test(int, java.lang.String[][])'">MethodType.methodType(void.class, int.class, String[][].class)</warning>);
-    l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'Test(java.lang.String[])'">MethodType.methodType(void.class, String[].class)</warning>);
+    l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'Test(String)'">MethodType.methodType(void.class, String.class)</warning>);
+    l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'Test(int, String[][])'">MethodType.methodType(void.class, int.class, String[][].class)</warning>);
+    l.findConstructor(Test.class, <warning descr="Cannot resolve constructor 'Test(String[])'">MethodType.methodType(void.class, String[].class)</warning>);
 
     l.findConstructor(WithDefault.class, MethodType.methodType(void.class));
     l.findConstructor(Class.forName("WithDefault"), MethodType.methodType(void.class));
diff --git a/java/java-tests/testData/inspection/invokeHandleSignature/GenericMethod.java b/java/java-tests/testData/inspection/invokeHandleSignature/GenericMethod.java
index c8492b208a28..61d40b6fa91b 100644
--- a/java/java-tests/testData/inspection/invokeHandleSignature/GenericMethod.java
+++ b/java/java-tests/testData/inspection/invokeHandleSignature/GenericMethod.java
@@ -6,16 +6,16 @@ class Main {
 
     l.findVirtual(Test.class, "method1", MethodType.genericMethodType(2));
     l.findVirtual(Test.class, "method1", MethodType.genericMethodType(2, false));
-    l.findVirtual(Test.class, "method1", <warning descr="Cannot resolve method 'java.lang.Object method1(java.lang.Object, java.lang.Object, java.lang.Object[])'">MethodType.genericMethodType(2, true)</warning>);
-    l.findVirtual(Test.class, "method1", <warning descr="Cannot resolve method 'java.lang.Object method1(java.lang.Object)'">MethodType.genericMethodType(1)</warning>);
-    l.findVirtual(Test.class, "method1", <warning descr="Cannot resolve method 'java.lang.Object method1(java.lang.Object, java.lang.Object, java.lang.Object)'">MethodType.genericMethodType(3)</warning>);
+    l.findVirtual(Test.class, "method1", <warning descr="Cannot resolve method 'Object method1(Object, Object, Object[])'">MethodType.genericMethodType(2, true)</warning>);
+    l.findVirtual(Test.class, "method1", <warning descr="Cannot resolve method 'Object method1(Object)'">MethodType.genericMethodType(1)</warning>);
+    l.findVirtual(Test.class, "method1", <warning descr="Cannot resolve method 'Object method1(Object, Object, Object)'">MethodType.genericMethodType(3)</warning>);
 
     l.findVirtual(Test.class, "method2", MethodType.genericMethodType(2, true));
-    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'java.lang.Object method2(java.lang.Object, java.lang.Object)'">MethodType.genericMethodType(2, false)</warning>);
-    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'java.lang.Object method2(java.lang.Object)'">MethodType.genericMethodType(1)</warning>);
-    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'java.lang.Object method2(java.lang.Object, java.lang.Object[])'">MethodType.genericMethodType(1, true)</warning>);
-    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'java.lang.Object method2(java.lang.Object, java.lang.Object)'">MethodType.genericMethodType(2)</warning>);
-    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'java.lang.Object method2(java.lang.Object, java.lang.Object, java.lang.Object)'">MethodType.genericMethodType(3)</warning>);
+    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'Object method2(Object, Object)'">MethodType.genericMethodType(2, false)</warning>);
+    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'Object method2(Object)'">MethodType.genericMethodType(1)</warning>);
+    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'Object method2(Object, Object[])'">MethodType.genericMethodType(1, true)</warning>);
+    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'Object method2(Object, Object)'">MethodType.genericMethodType(2)</warning>);
+    l.findVirtual(Test.class, "method2", <warning descr="Cannot resolve method 'Object method2(Object, Object, Object)'">MethodType.genericMethodType(3)</warning>);
   }
 }
 
diff --git a/java/java-tests/testData/inspection/invokeHandleSignature/OverloadedMethod.java b/java/java-tests/testData/inspection/invokeHandleSignature/OverloadedMethod.java
index 71b280985225..1e3238435ab1 100644
--- a/java/java-tests/testData/inspection/invokeHandleSignature/OverloadedMethod.java
+++ b/java/java-tests/testData/inspection/invokeHandleSignature/OverloadedMethod.java
@@ -20,8 +20,8 @@ class Main {
     l.findVirtual(Test.class, "method", <warning descr="Cannot resolve method 'short method(char)'">MethodType.methodType(short.class, char.class)</warning>);
     l.findVirtual(Test.class, "method", <warning descr="Cannot resolve method 'int method(int[])'">MethodType.methodType(int.class, int[].class)</warning>);
     l.findVirtual(Test.class, "method", <warning descr="Cannot resolve method 'int method(int[][])'">MethodType.methodType(int.class, int[][].class)</warning>);
-    l.findVirtual(Test.class, "method", <warning descr="Cannot resolve method 'java.lang.Object[] method(java.lang.Object[])'">MethodType.methodType(Object[].class, Object[].class)</warning>);
-    l.findVirtual(Test.class, "method", <warning descr="Cannot resolve method 'java.lang.Object[][] method(java.lang.Object[][])'">MethodType.methodType(Object[][].class, Object[][].class)</warning>);
+    l.findVirtual(Test.class, "method", <warning descr="Cannot resolve method 'Object[] method(Object[])'">MethodType.methodType(Object[].class, Object[].class)</warning>);
+    l.findVirtual(Test.class, "method", <warning descr="Cannot resolve method 'Object[][] method(Object[][])'">MethodType.methodType(Object[][].class, Object[][].class)</warning>);
 
     l.<warning descr="Method 'method' is static">findStatic</warning>(Test.class, "method", MethodType.methodType(void.class));
     l.findVirtual(Test.class, <warning descr="Cannot resolve method 'doesntExist'">"doesntExist"</warning>, MethodType.methodType(void.class));
diff --git a/java/java-tests/testData/inspection/invokeHandleSignature/StaticMethod.java b/java/java-tests/testData/inspection/invokeHandleSignature/StaticMethod.java
index 0caa77cd9035..fd1366cbee14 100644
--- a/java/java-tests/testData/inspection/invokeHandleSignature/StaticMethod.java
+++ b/java/java-tests/testData/inspection/invokeHandleSignature/StaticMethod.java
@@ -9,8 +9,8 @@ class Main {
     l.findStatic(Test.class, "method3", MethodType.methodType(String.class, String.class, String[].class));
 
     l.findStatic(Test.class, "method1", <warning descr="Cannot resolve method 'Test method1()'">MethodType.methodType(Test.class)</warning>);
-    l.findStatic(Test.class, "method2", <warning descr="Cannot resolve method 'int method2(java.lang.String)'">MethodType.methodType(int.class, String.class)</warning>);
-    l.findStatic(Test.class, "method3", <warning descr="Cannot resolve method 'java.lang.String method3()'">MethodType.methodType(String.class)</warning>);
+    l.findStatic(Test.class, "method2", <warning descr="Cannot resolve method 'int method2(String)'">MethodType.methodType(int.class, String.class)</warning>);
+    l.findStatic(Test.class, "method3", <warning descr="Cannot resolve method 'String method3()'">MethodType.methodType(String.class)</warning>);
 
     l.<warning descr="Method 'method1' is not static">findVirtual</warning>(Test.class, "method1", MethodType.methodType(void.class));
     l.findStatic(Test.class, <warning descr="Cannot resolve method 'doesntExist'">"doesntExist"</warning>, MethodType.methodType(String.class));