diff --git a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticAutofeature.java b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticFeature.java
similarity index 95%
rename from hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticAutofeature.java
rename to hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticFeature.java
index a8f155b104..3cda838061 100644
--- a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticAutofeature.java
+++ b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticFeature.java
@@ -33,7 +33,7 @@
  * </p>
  * @author Sanne Grinovero
  */
-public class GraalVMStaticAutofeature implements Feature {
+public class GraalVMStaticFeature implements Feature {
 
 	public void beforeAnalysis(Feature.BeforeAnalysisAccess before) {
 		final Class<?>[] needsHavingSimpleConstructors = StaticClassLists.typesNeedingDefaultConstructorAccessible();
@@ -56,6 +56,6 @@ public void beforeAnalysis(Feature.BeforeAnalysisAccess before) {
 
 	@Override
 	public String getDescription() {
-		return "Hibernate ORM GraalVM static reflection registration";
+		return "Hibernate ORM's static reflection registrations for GraalVM";
 	}
 }
diff --git a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/QueryParsingSupport.java b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/QueryParsingSupport.java
index 511634b33c..ab2da56dd1 100644
--- a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/QueryParsingSupport.java
+++ b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/QueryParsingSupport.java
@@ -20,7 +20,7 @@
 /**
  * This registers all ANTLR parser nodes for reflection, something that is necessary
  * as the HQL parser's inner workings are based on reflection.
- * This is different than the "static" registrations of {@link GraalVMStaticAutofeature}
+ * This is different than the "static" registrations of {@link GraalVMStaticFeature}
  * as we only register these if the HQL parser is actually reachable: some particularly
  * simple applications might not need dynamic queries being expressed in string form,
  * and for such cases the reflective registrations can be skipped.
@@ -51,7 +51,7 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
 
 	@Override
 	public String getDescription() {
-		return "Hibernate ORM HQL Parser Support";
+		return "Hibernate ORM's support for HQL Parser in GraalVM";
 	}
 
 	@AllowSysOut