diff --git a/orm/src/main/java/org/hibernate/tool/internal/export/dao/DaoHelper.java b/orm/src/main/java/org/hibernate/tool/internal/export/dao/DaoHelper.java
index abfeab434b..7fc81678a5 100644
--- a/orm/src/main/java/org/hibernate/tool/internal/export/dao/DaoHelper.java
+++ b/orm/src/main/java/org/hibernate/tool/internal/export/dao/DaoHelper.java
@@ -9,11 +9,11 @@
 
 public class DaoHelper {
 	
-	public static Iterable<NamedHqlQueryDefinition> getNamedHqlQueryDefinitions(Metadata metadata) {
-		List<NamedHqlQueryDefinition> result = new ArrayList<NamedHqlQueryDefinition>();
-		metadata.visitNamedHqlQueryDefinitions(new Consumer<NamedHqlQueryDefinition>() {			
+	public static Iterable<NamedHqlQueryDefinition<?>> getNamedHqlQueryDefinitions(Metadata metadata) {
+		List<NamedHqlQueryDefinition<?>> result = new ArrayList<NamedHqlQueryDefinition<?>>();
+		metadata.visitNamedHqlQueryDefinitions(new Consumer<NamedHqlQueryDefinition<?>>() {			
 			@Override
-			public void accept(NamedHqlQueryDefinition t) {
+			public void accept(NamedHqlQueryDefinition<?> t) {
 				result.add(t);
 			}
 		});
diff --git a/orm/src/main/java/org/hibernate/tool/internal/export/hbm/Cfg2HbmTool.java b/orm/src/main/java/org/hibernate/tool/internal/export/hbm/Cfg2HbmTool.java
index ee9134b9ba..392f620f03 100644
--- a/orm/src/main/java/org/hibernate/tool/internal/export/hbm/Cfg2HbmTool.java
+++ b/orm/src/main/java/org/hibernate/tool/internal/export/hbm/Cfg2HbmTool.java
@@ -268,10 +268,10 @@ public boolean isTemporalValue(Property property) {
 	}
 
     public boolean isNamedQueries(Metadata md) {
-    	final ArrayList<NamedHqlQueryDefinition> list = new ArrayList<NamedHqlQueryDefinition>();
-    	Consumer<NamedHqlQueryDefinition> consumer = new Consumer<NamedHqlQueryDefinition>() {
+    	final ArrayList<NamedHqlQueryDefinition<?>> list = new ArrayList<NamedHqlQueryDefinition<?>>();
+    	Consumer<NamedHqlQueryDefinition<?>> consumer = new Consumer<NamedHqlQueryDefinition<?>>() {
 			@Override
-			public void accept(NamedHqlQueryDefinition namedHqlQueryDefinition) {
+			public void accept(NamedHqlQueryDefinition<?> namedHqlQueryDefinition) {
 				list.add(namedHqlQueryDefinition);
 			}
 		};
@@ -280,10 +280,10 @@ public void accept(NamedHqlQueryDefinition namedHqlQueryDefinition) {
 	}
 
 	public boolean isNamedSQLQueries(Metadata md) {
-	   	final ArrayList<NamedNativeQueryDefinition> list = new ArrayList<NamedNativeQueryDefinition>();
-    	Consumer<NamedNativeQueryDefinition> consumer = new Consumer<NamedNativeQueryDefinition>() {
+	   	final ArrayList<NamedNativeQueryDefinition<?>> list = new ArrayList<NamedNativeQueryDefinition<?>>();
+    	Consumer<NamedNativeQueryDefinition<?>> consumer = new Consumer<NamedNativeQueryDefinition<?>>() {
 			@Override
-			public void accept(NamedNativeQueryDefinition namedHqlQueryDefinition) {
+			public void accept(NamedNativeQueryDefinition<?> namedHqlQueryDefinition) {
 				list.add(namedHqlQueryDefinition);
 			}
 		};
diff --git a/pom.xml b/pom.xml
index e7eeee6e21..a480d96c40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
         <google-java-format.version>1.19.1</google-java-format.version>
         <h2.version>2.2.224</h2.version>
         <hibernate-commons-annotations.version>6.0.6.Final</hibernate-commons-annotations.version>
-        <hibernate-orm.version>7.0.0.Alpha1</hibernate-orm.version>
+        <hibernate-orm.version>7.0.0.Alpha2</hibernate-orm.version>
         <hsqldb.version>2.6.1</hsqldb.version>
         <javaee-api.version>8.0.1</javaee-api.version>
         <jboss-logging.version>3.5.3.Final</jboss-logging.version>