diff --git a/grace-shell/src/main/groovy/org/grails/cli/compiler/dependencies/DependencyManagementArtifactCoordinatesResolver.java b/grace-shell/src/main/groovy/org/grails/cli/compiler/dependencies/DependencyManagementArtifactCoordinatesResolver.java
index ca5fb8214b..1ec293c6ac 100644
--- a/grace-shell/src/main/groovy/org/grails/cli/compiler/dependencies/DependencyManagementArtifactCoordinatesResolver.java
+++ b/grace-shell/src/main/groovy/org/grails/cli/compiler/dependencies/DependencyManagementArtifactCoordinatesResolver.java
@@ -30,7 +30,7 @@
  */
 public class DependencyManagementArtifactCoordinatesResolver implements ArtifactCoordinatesResolver {
 
-    public static final Set<String> GRAILS_PLUGINS = Set.of("async", "cache", "events", "fields", "hibernate5", "gsp", "scaffolding");
+    public static final Set<String> GRAILS_PLUGINS = Set.of("async", "cache", "events", "fields", "hibernate", "hibernate5", "gsp", "scaffolding");
 
     private final DependencyManagement dependencyManagement;
 
diff --git a/grace-test-suite-persistence/build.gradle b/grace-test-suite-persistence/build.gradle
index 416fb685f2..95a310452d 100644
--- a/grace-test-suite-persistence/build.gradle
+++ b/grace-test-suite-persistence/build.gradle
@@ -18,7 +18,7 @@ dependencies {
 
     testImplementation libs.grails.async.core
     testImplementation libs.grails.datastore.gorm.validation
-    testImplementation libs.grails.datastore.gorm.hibernate5, {
+    testImplementation libs.grails.datastore.gorm.hibernate, {
         exclude group: 'org.graceframework', module:'grace-datastore-gorm'
         exclude group: 'org.graceframework', module:'grace-datastore-core'
         exclude group: 'org.springframework', module:'spring-core'
diff --git a/grace-test-suite-uber/build.gradle b/grace-test-suite-uber/build.gradle
index 48767f1a5b..ffc0b6bb1a 100644
--- a/grace-test-suite-uber/build.gradle
+++ b/grace-test-suite-uber/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     testImplementation project(":grace-plugin-databinding")
     testImplementation project(":grace-spring")
     testImplementation project(":grace-test-support")
-    testImplementation libs.grails.datastore.gorm.hibernate5, {
+    testImplementation libs.grails.datastore.gorm.hibernate, {
         exclude group: 'org.graceframework', module:'grace-datastore-gorm'
         exclude group: 'org.graceframework', module:'grace-datastore-core'
         exclude group: 'org.springframework', module:'spring-core'
diff --git a/grace-test-suite-web/build.gradle b/grace-test-suite-web/build.gradle
index 145296f934..1d9efc3ae7 100644
--- a/grace-test-suite-web/build.gradle
+++ b/grace-test-suite-web/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     testImplementation libs.jakarta.servlet.jsp.jstl
     testImplementation libs.glassfish.web.jsp.jstl
 
-    testImplementation libs.grails.datastore.gorm.hibernate5, {
+    testImplementation libs.grails.datastore.gorm.hibernate, {
         exclude group: 'org.graceframework', module:'grace-datastore-gorm'
         exclude group: 'org.graceframework', module:'grace-datastore-core'
         exclude group: 'org.springframework', module:'spring-core'
diff --git a/gradle/grails.versions.toml b/gradle/grails.versions.toml
index a4b188ae1f..d4b673cc9f 100644
--- a/gradle/grails.versions.toml
+++ b/gradle/grails.versions.toml
@@ -4,7 +4,7 @@ cache = "6.0.0-M2"
 database-migration = "6.0.0-M2"
 fields = "6.0.0-M2"
 geb = "6.0.0-M2"
-hibernate5 = "2023.0.0-SNAPSHOT"
+hibernate = "2023.0.0-SNAPSHOT"
 scaffolding = "6.0.0-M2"
 
 [profiles]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 81b79a0da7..fa7f0b0982 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -92,7 +92,7 @@ grails-datastore-core = { module = "org.graceframework:grace-datastore-core", ve
 grails-datastore-async = { module = "org.graceframework:grace-datastore-async", version.ref = "grace-gorm" }
 grails-datastore-gorm = { module = "org.graceframework:grace-datastore-gorm", version.ref = "grace-gorm" }
 grails-datastore-gorm-async = { module = "org.graceframework:grace-datastore-gorm-async", version.ref = "grace-gorm" }
-grails-datastore-gorm-hibernate5 = { module = "org.graceframework:grace-datastore-gorm-hibernate5", version.ref = "grace-gorm-hibernate" }
+grails-datastore-gorm-hibernate = { module = "org.graceframework:grace-datastore-gorm-hibernate", version.ref = "grace-gorm-hibernate" }
 grails-datastore-gorm-support = { module = "org.graceframework:grace-datastore-gorm-support", version.ref = "grace-gorm" }
 grails-datastore-gorm-test = { module = "org.graceframework:grace-datastore-gorm-test", version.ref = "grace-gorm" }
 grails-datastore-gorm-validation = { module = "org.graceframework:grace-datastore-gorm-validation", version.ref = "grace-gorm" }
@@ -201,7 +201,7 @@ bom = ["groovy-bom", "spring-framework-bom", "spring-boot-dependencies"]
 grails-async = ["grails-async-core", "grails-async-gpars", "grails-async-rxjava", "grails-async-rxjava2", "grails-async-rxjava3", "grails-plugin-async"]
 grails-devtools = ["methvin-directoryWatcher"]
 grails-events = ["grails-events-core", "grails-events-compat", "grails-events-gpars", "grails-events-rxjava", "grails-events-rxjava2", "grails-events-rxjava3", "grails-events-spring", "grails-events-transform", "grails-plugin-events"]
-grails-gorm = ["grails-datastore-core", "grails-datastore-async", "grails-datastore-gorm", "grails-datastore-gorm-async", "grails-datastore-gorm-hibernate5", "grails-datastore-gorm-support", "grails-datastore-gorm-test", "grails-datastore-gorm-validation"]
+grails-gorm = ["grails-datastore-core", "grails-datastore-async", "grails-datastore-gorm", "grails-datastore-gorm-async", "grails-datastore-gorm-hibernate", "grails-datastore-gorm-support", "grails-datastore-gorm-test", "grails-datastore-gorm-validation"]
 grails-scaffolding = ["grails-scaffolding-core"]
 grails-views = ["grails-views-component", "grails-views-core", "grails-views-gradle", "grails-views-json", "grails-views-json-templates", "grails-views-json-testing-support", "grails-views-markup"]
 groovy = ["groovy-bom"]