diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
index 82796c473c..defc623b68 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
@@ -284,6 +284,7 @@ public class QueryMethod extends AbstractQueryMethod {
 			return stem + "_"
 					+ paramTypes.stream()
 							.filter(type -> !isSpecialParam(type))
+							.map(type -> type.indexOf('<')>0 ? type.substring(0, type.indexOf('<')) : type)
 							.map(StringHelper::unqualify)
 							.map(type -> type.replace("[]", "Array"))
 							.reduce((x,y) -> x + '_' + y)