diff --git a/build.gradle b/build.gradle
index fd72917b22..9f01b599fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,7 +80,7 @@ ext {
         'scaffolding-core': [
                 version: libs.versions.grails.scaffolding.get(),
                 group  : 'org.grails',
-                names  : ['grails-scaffolding'],
+                names  : ['scaffolding'],
                 modules: ['core']
         ],
         'groovy': [
@@ -148,7 +148,7 @@ ext {
 }
 
 version = grailsVersion
-group = "org.grails"
+group = "org.graceframework"
 
 // directories created during the build which are related
 // to turning the workspace root into a GRAILS_HOME
@@ -257,18 +257,18 @@ apply from: "gradle/idea.gradle"
 
 subprojects { project ->
     version = grailsVersion
-    group = "org.grails"
+    group = "org.graceframework"
 
     configurations {
         documentation
     }
 
-    ext.isTestSuite = project.name.startsWith("grails-test-suite")
+    ext.isTestSuite = project.name.startsWith("grace-test-suite")
     ext.isCiBuild = project.hasProperty("isCiBuild") || System.getenv().get("CI") as Boolean
     ext.pomInfo = {
-        delegate.name 'Grails'
-        delegate.description 'Grails Web Application Framework'
-        delegate.url 'https://grails.org/'
+        delegate.name 'Grace'
+        delegate.description 'Grace Web Application Framework'
+        delegate.url 'https://graceframework.org/'
 
         delegate.licenses {
             delegate.license {
@@ -279,9 +279,9 @@ subprojects { project ->
         }
 
         delegate.scm {
-            delegate.url 'scm:git@github.com:grails/grails-core.git'
-            delegate.connection 'scm:git@github.com:grails/grails-core.git'
-            delegate.developerConnection 'scm:git@github.com:grails/grails-core.git'
+            delegate.url 'scm:git@github.com:graceframework/grace-framework.git'
+            delegate.connection 'scm:git@github.com:graceframework/grace-framework.git'
+            delegate.developerConnection 'scm:git@github.com:graceframework/grace-framework.git'
         }
 
         delegate.developers {
@@ -297,6 +297,10 @@ subprojects { project ->
                 delegate.id 'lhotari'
                 delegate.name 'Lari Hotari'
             }
+            delegate.developer {
+                delegate.id 'rainboyan'
+                delegate.name 'Michael Yan'
+            }
         }
 
     }
@@ -342,8 +346,8 @@ subprojects { project ->
                 }
             }
 
-            if(project.name == 'grails-dependencies') return
-            if(project.name == 'grails-bom') return
+            if(project.name == 'grace-dependencies') return
+            if(project.name == 'grace-bom') return
 
             publications {
                 mavenJava(MavenPublication) {
@@ -384,13 +388,13 @@ subprojects { project ->
 
     }
 
-    if(project.name == 'grails-dependencies') return
-    if(project.name == 'grails-bom') return
+    if(project.name == 'grace-dependencies') return
+    if(project.name == 'grace-bom') return
 
     sourceCompatibility = 11
     targetCompatibility = 11
 
-    if(project.name =~ /^(grails-web|grails-plugin-|grails-test-suite|grails-test)/) {
+    if(project.name =~ /^(grace-web|grace-plugin-|grace-test-suite|grace-test)/) {
         dependencies {
             api libs.javax.servlet
             // MockHttpServletRequest/Response/Context used in many classes
@@ -400,7 +404,7 @@ subprojects { project ->
         }
     }
 
-    if(project.name =~ /^(grails-plugin-datasource|grails-test-suite)/) {
+    if(project.name =~ /^(grace-plugin-datasource|grace-test-suite)/) {
         dependencies {
             testImplementation libs.hsqldb
             testImplementation libs.h2
@@ -411,9 +415,9 @@ subprojects { project ->
         manifest.mainAttributes(
             "Built-By": System.properties['user.name'],
             "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")",
-            "Implementation-Title": "Grails",
+            "Implementation-Title": "Grace",
             "Implementation-Version": grailsVersion,
-            "Implementation-Vendor": 'grails.org')
+            "Implementation-Vendor": 'graceframework.org')
     }
 
     checkstyle {
@@ -479,7 +483,7 @@ subprojects { project ->
         testImplementation libs.junit.platform.runner
         testRuntimeOnly libs.junit.jupiter.engine
 
-        if (project.name != "grails-docs") {
+        if (project.name != "grace-docs") {
             // Logging
             api libs.slf4j
             api libs.slf4j.jcl
@@ -610,8 +614,8 @@ sdkman {
     api = "https://vendors.sdkman.io"
     consumerKey = System.getenv("GVM_SDKVENDOR_KEY") ?: project.hasProperty("gvmSdkvendorKey") ? project.gvmSdkvendorKey : ''
     consumerToken = System.getenv("GVM_SDKVENDOR_TOKEN") ?: project.hasProperty("gvmSdkvendorToken") ? project.gvmSdkvendorToken : ''
-    candidate = "grails"
+    candidate = "grace"
     version = project.version
-    url = "https://github.com/grails/grails-core/releases/download/v${project.version}/grails-${project.version}.zip"
+    url = "https://github.com/graceframework/grace-framework/releases/download/v${project.version}/grace-${project.version}.zip"
     hashtag = "#grailsfw"
 }
diff --git a/grace-api/build.gradle b/grace-api/build.gradle
index 6e87483ab1..0e7294fa1a 100644
--- a/grace-api/build.gradle
+++ b/grace-api/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    api project(":grails-bootstrap")
-    api project(":grails-util")
+    api project(":grace-bootstrap")
+    api project(":grace-util")
 
     api libs.gorm.datastore.core, {
         transitive = false
diff --git a/grace-bom/build.gradle b/grace-bom/build.gradle
index f46182e277..03caf09cf0 100644
--- a/grace-bom/build.gradle
+++ b/grace-bom/build.gradle
@@ -36,17 +36,17 @@ publishing {
                     mkp.dependencyManagement {
                         mkp.dependencies {
                             for (sub in project.parent.subprojects) {
-                                if (sub.name == 'grails-bom') continue
+                                if (sub.name == 'grace-bom') continue
 
                                 mkp.dependency {
                                     mkp.groupId sub.group
                                     mkp.artifactId sub.name
                                     mkp.version sub.version
-                                    if (sub.name == 'grails-dependencies') {
+                                    if (sub.name == 'grace-dependencies') {
                                         mkp.type 'pom'
                                     }
 
-                                    if (sub.name == 'grails-bootstrap') {
+                                    if (sub.name == 'grace-bootstrap') {
                                         mkp.exclusions {
                                             mkp.exclusion {
                                                 mkp.groupId 'jline'
diff --git a/grace-bom/plugins.properties b/grace-bom/plugins.properties
index 6fac5820f2..4472769378 100644
--- a/grace-bom/plugins.properties
+++ b/grace-bom/plugins.properties
@@ -1,13 +1,13 @@
-gorm.hibernate5=7.2.3-SNAPSHOT
+gorm.hibernate5=7.2.2
 gorm.mongodb=7.2.1
 gorm.neo4j=7.2.1
-grails-gradle-plugin=22.0.0-SNAPSHOT
+grails-gradle-plugin=5.1.5
 cache=5.0.1
 rxjava=1.1.1
 rxjava2=2.0.0
-scaffolding=5.0.0-SNAPSHOT
-fields=5.0.0-SNAPSHOT
+scaffolding=4.1.0
+fields=3.0.0.RC1
 geb=3.0.0
-views-json=2.2.2-SNAPSHOT
-views-json-templates=2.2.2-SNAPSHOT
-views-markup=2.2.2-SNAPSHOT
+views-json=2.2.1
+views-json-templates=2.2.1
+views-markup=2.2.1
diff --git a/grace-bom/profiles.properties b/grace-bom/profiles.properties
index 4890141686..7e4c48148f 100644
--- a/grace-bom/profiles.properties
+++ b/grace-bom/profiles.properties
@@ -1,8 +1,8 @@
 rest-api=5.0.1
 base=5.0.6
 web=5.0.4
-web-bootstrap=5.0.0-SNAPSHOT
-web-clean=5.0.0-SNAPSHOT
+#web-bootstrap=5.0.0-SNAPSHOT
+#web-clean=5.0.0-SNAPSHOT
 react=5.0.0
 vue=5.0.0
 plugin=5.0.1
diff --git a/grace-boot/build.gradle b/grace-boot/build.gradle
index 7b240d8584..0204703635 100644
--- a/grace-boot/build.gradle
+++ b/grace-boot/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(":grails-plugin-api")
-    api project(":grails-plugin-core")
-    api project(":grails-spring")
-    api project(":grails-spring-boot")
-    api project(":grails-web")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(":grace-plugin-api")
+    api project(":grace-plugin-core")
+    api project(":grace-spring")
+    api project(":grace-spring-boot")
+    api project(":grace-web")
 
     api libs.javax.annotation
     api libs.javax.inject
@@ -22,14 +22,14 @@ dependencies {
     compileOnly libs.micronaut.spring
     compileOnly libs.micronaut.spring.context
 
-    testImplementation project(":grails-plugin-controllers")
-    testImplementation project(":grails-test")
+    testImplementation project(":grace-plugin-controllers")
+    testImplementation project(":grace-test")
 
     testImplementation libs.assertj.core
     testImplementation libs.mockito.core
     testImplementation libs.mockito.junit
     testImplementation libs.spring.boot.test
     testImplementation libs.tomcat.embed.core
-    testRuntimeOnly project(":grails-plugin-i18n")
-    testRuntimeOnly project(":grails-plugin-url-mappings")
+    testRuntimeOnly project(":grace-plugin-i18n")
+    testRuntimeOnly project(":grace-plugin-url-mappings")
 }
diff --git a/grace-bootstrap/build.gradle b/grace-bootstrap/build.gradle
index a1e5c8633f..f389d95377 100644
--- a/grace-bootstrap/build.gradle
+++ b/grace-bootstrap/build.gradle
@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 dependencies {
-    api project(":grails-util")
+    api project(":grace-util")
 
     api libs.groovy.templates
     api libs.groovy.xml
diff --git a/grace-cli/build.gradle b/grace-cli/build.gradle
index 11df859bec..a1daabc7ec 100644
--- a/grace-cli/build.gradle
+++ b/grace-cli/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
 
     api libs.groovy.core
     api libs.groovy.templates
diff --git a/grace-console/build.gradle b/grace-console/build.gradle
index de184888e9..8fa18e0025 100644
--- a/grace-console/build.gradle
+++ b/grace-console/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-core")
-    api project(":grails-boot")
+    api project(":grace-api")
+    api project(":grace-core")
+    api project(":grace-boot")
 
     api libs.javax.servlet, optional
     api libs.groovy.console
diff --git a/grace-core/build.gradle b/grace-core/build.gradle
index fcdfd23074..f3e38c6b1b 100644
--- a/grace-core/build.gradle
+++ b/grace-core/build.gradle
@@ -1,9 +1,9 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-plugin-api")
-    api project(":grails-spring")
-    api project(":grails-util")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-plugin-api")
+    api project(":grace-spring")
+    api project(":grace-util")
 
     api libs.gorm.datastore.core
     api libs.spring.beans
@@ -13,7 +13,7 @@ dependencies {
     api libs.spring.tx
     compileOnly libs.micronaut.spring.context
 
-    testImplementation project(":grails-test")
+    testImplementation project(":grace-test")
     testImplementation libs.spring.jdbc
     testImplementation libs.spring.test
 }
diff --git a/grace-dependencies/build.gradle b/grace-dependencies/build.gradle
index b6915b7072..a07c42895d 100644
--- a/grace-dependencies/build.gradle
+++ b/grace-dependencies/build.gradle
@@ -13,7 +13,7 @@ publishing {
                     delegate.dependencies {
                         delegate.dependency {
                             delegate.groupId "org.grails"
-                            delegate.artifactId "grails-bootstrap"
+                            delegate.artifactId "grace-bootstrap"
                             delegate.version( project.version )
                             delegate.scope "api"
 
@@ -39,7 +39,7 @@ publishing {
                         for(sub in ['converters', 'rest', 'databinding', 'i18n', 'services', 'url-mappings', 'interceptors']) {
                             delegate.dependency {
                                 delegate.groupId "org.grails"
-                                delegate.artifactId "grails-plugin-${sub}"
+                                delegate.artifactId "grace-plugin-${sub}"
                                 delegate.version( project.version )
                                 delegate.scope "api"
                             }
diff --git a/grace-docs/build.gradle b/grace-docs/build.gradle
index b5d78a261a..4c0d4bd7cc 100644
--- a/grace-docs/build.gradle
+++ b/grace-docs/build.gradle
@@ -32,7 +32,7 @@ sourceSets {
 tasks.register("docFilesJar", Jar) {
     description = 'Package up files used for generating documentation.'
     archiveVersion = null
-    archiveFileName = "grails-doc-files.jar"
+    archiveFileName = "grace-doc-files.jar"
     from "src/main/template"
 }
 
diff --git a/grace-encoder/build.gradle b/grace-encoder/build.gradle
index 686d3ae0ac..dd823cd1e7 100644
--- a/grace-encoder/build.gradle
+++ b/grace-encoder/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-util")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-util")
 
     api libs.groovy.json
     api libs.spring.context
diff --git a/grace-gradle-plugin/build.gradle b/grace-gradle-plugin/build.gradle
index a33dfc353f..9d1c6561f9 100644
--- a/grace-gradle-plugin/build.gradle
+++ b/grace-gradle-plugin/build.gradle
@@ -19,9 +19,9 @@ configurations {
 }
 
 dependencies {
-    api project(":grails-bootstrap")
-    api project(":grails-gradle-model")
-    api project(":grails-shell"), {
+    api project(":grace-bootstrap")
+    api project(":grace-gradle-model")
+    api project(":grace-shell"), {
         exclude group: "org.slf4j", module: "slf4j-simple"
     }
     api gradleApi()
@@ -39,51 +39,51 @@ dependencies {
 gradlePlugin {
     plugins {
         grailsCore {
-            displayName = "Grails Core Gradle Plugin"
-            description = 'The main Grails gradle plugin implementation'
-            id = 'org.grails.grails-core'
+            displayName = "Grace Core Gradle Plugin"
+            description = 'The main Grace gradle plugin implementation'
+            id = 'org.graceframework.grace-core'
             implementationClass = 'org.grails.gradle.plugin.core.GrailsGradlePlugin'
         }
         grailsDoc {
-            displayName = "Grails Doc Gradle Plugin"
-            description = 'Adds Grails doc publishing support'
-            id = 'org.grails.grails-doc'
+            displayName = "Grace Doc Gradle Plugin"
+            description = 'Adds Grace doc publishing support'
+            id = 'org.graceframework.grace-doc'
             implementationClass = 'org.grails.gradle.plugin.doc.GrailsDocGradlePlugin'
         }
         grailsGsp {
-            displayName = "Grails GSP Gradle Plugin"
+            displayName = "Grace GSP Gradle Plugin"
             description = 'A plugin that adds support for compiling Groovy Server Pages (GSP)'
-            id = 'org.grails.grails-gsp'
+            id = 'org.graceframework.grace-gsp'
             implementationClass = 'org.grails.gradle.plugin.web.gsp.GroovyPagePlugin'
         }
         grailsPlugin {
-            displayName = "Grails-Plugin Gradle Plugin"
-            description = 'A Gradle plugin for Grails plugins'
-            id = 'org.grails.grails-plugin'
+            displayName = "Grace-Plugin Gradle Plugin"
+            description = 'A Gradle plugin for Grace plugins'
+            id = 'org.graceframework.grace-plugin'
             implementationClass = 'org.grails.gradle.plugin.core.GrailsPluginGradlePlugin'
         }
         grailsProfile {
-            displayName = "Grails Profile Gradle Plugin"
-            description = 'A plugin that is capable of compiling a Grails profile into a JAR file for distribution'
-            id = 'org.grails.grails-profile'
+            displayName = "Grace Profile Gradle Plugin"
+            description = 'A plugin that is capable of compiling a Grace profile into a JAR file for distribution'
+            id = 'org.graceframework.grace-profile'
             implementationClass = 'org.grails.gradle.plugin.profiles.GrailsProfileGradlePlugin'
         }
         grailsWeb {
-            displayName = "Grails Web Gradle Plugin"
+            displayName = "Grace Web Gradle Plugin"
             description = 'Adds web specific extensions'
-            id = 'org.grails.grails-web'
+            id = 'org.graceframework.grace-web'
             implementationClass = 'org.grails.gradle.plugin.web.GrailsWebGradlePlugin'
         }
         grailsPluginPublish {
-            displayName = "Grails Publish Gradle Plugin"
-            description = 'A plugin to setup publishing to Grails central repo'
-            id = 'org.grails.internal.grails-plugin-publish'
+            displayName = "Grace Publish Gradle Plugin"
+            description = 'A plugin to setup publishing to Grace central repo'
+            id = 'org.graceframework.internal.grace-plugin-publish'
             implementationClass = 'org.grails.gradle.plugin.publishing.internal.GrailsCentralPublishGradlePlugin'
         }
         grailsProfilePublish {
-            displayName = "Grails Profile Publish Plugin"
+            displayName = "Grace Profile Publish Plugin"
             description = 'A plugin for publishing profiles'
-            id = 'org.grails.internal.grails-profile-publish'
+            id = 'org.graceframework.internal.grace-profile-publish'
             implementationClass = 'org.grails.gradle.plugin.profiles.internal.GrailsProfilePublishGradlePlugin'
         }
     }
@@ -95,7 +95,7 @@ jar {
             "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")",
             "Implementation-Title": "Grails",
             "Implementation-Version": projectVersion,
-            "Implementation-Vendor": 'grails.org')
+            "Implementation-Vendor": 'graceframework.org')
 }
 
 configure([compileGroovy, compileTestGroovy]) {
diff --git a/grace-logging/build.gradle b/grace-logging/build.gradle
index 9a260428d3..c71c8158ed 100644
--- a/grace-logging/build.gradle
+++ b/grace-logging/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    api project(":grails-core")
+    api project(":grace-core")
 }
diff --git a/grace-plugin-api/build.gradle b/grace-plugin-api/build.gradle
index 8956400a74..564933cb36 100644
--- a/grace-plugin-api/build.gradle
+++ b/grace-plugin-api/build.gradle
@@ -1,13 +1,13 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-spring")
-    api project(":grails-spring-boot")
-    api project(":grails-util")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-spring")
+    api project(":grace-spring-boot")
+    api project(":grace-util")
 
     api libs.gorm.datastore.core
 
-    testImplementation project(":grails-test")
+    testImplementation project(":grace-test")
     testImplementation(libs.spring.jdbc) {
         exclude group: 'commons-logging', module:'commons-logging'
     }
diff --git a/grace-plugin-codecs/build.gradle b/grace-plugin-codecs/build.gradle
index 081154d35a..6039613e18 100644
--- a/grace-plugin-codecs/build.gradle
+++ b/grace-plugin-codecs/build.gradle
@@ -1,11 +1,11 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-core")
-    api project(":grails-plugin-api")
-    api project(":grails-encoder")
-    runtimeOnly project(":grails-codecs")
+    api project(":grace-api")
+    api project(":grace-core")
+    api project(":grace-plugin-api")
+    api project(":grace-encoder")
+    runtimeOnly project(":grace-codecs")
 
     api(libs.spring.boot.autoconfigure)
 
-    testImplementation project(":grails-web-common")
+    testImplementation project(":grace-web-common")
 }
diff --git a/grace-plugin-controllers/build.gradle b/grace-plugin-controllers/build.gradle
index 6a390a006b..6620073934 100644
--- a/grace-plugin-controllers/build.gradle
+++ b/grace-plugin-controllers/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(":grails-plugin-api")
-    api project(":grails-plugin-mimetypes")
-    api project(":grails-plugin-validation")
-    api project(":grails-util")
-    api project(":grails-web")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(":grace-plugin-api")
+    api project(":grace-plugin-mimetypes")
+    api project(":grace-plugin-validation")
+    api project(":grace-util")
+    api project(":grace-web")
 
     annotationProcessor(libs.spring.boot.configurationProcessor)
     api(libs.spring.boot.autoconfigure)
diff --git a/grace-plugin-converters/build.gradle b/grace-plugin-converters/build.gradle
index 4b685b13e1..fc1ed70438 100644
--- a/grace-plugin-converters/build.gradle
+++ b/grace-plugin-converters/build.gradle
@@ -1,11 +1,11 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(":grails-plugin-api")
-    runtimeOnly project(":grails-plugin-controllers")
-    api project(":grails-util")
-    api project(":grails-web-common")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(":grace-plugin-api")
+    runtimeOnly project(":grace-plugin-controllers")
+    api project(":grace-util")
+    api project(":grace-web-common")
 
     api libs.commons.lang3
     compileOnly(libs.gorm.datastore.core) {
diff --git a/grace-plugin-core/build.gradle b/grace-plugin-core/build.gradle
index 23d49d050e..690ada6b89 100644
--- a/grace-plugin-core/build.gradle
+++ b/grace-plugin-core/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-plugin-api")
-    api project(":grails-spring")
-    api project(":grails-spring-boot")
+    api project(":grace-api")
+    api project(":grace-plugin-api")
+    api project(":grace-spring")
+    api project(":grace-spring-boot")
 
     api libs.groovy.core
     api libs.spring.beans
@@ -10,7 +10,7 @@ dependencies {
     api libs.spring.context
     api libs.spring.core
 
-    testImplementation project(":grails-test")
+    testImplementation project(":grace-test")
     testImplementation libs.spring.test
     testRuntimeOnly libs.spring.aspects
     testRuntimeOnly libs.aspectj.rt
diff --git a/grace-plugin-databinding/build.gradle b/grace-plugin-databinding/build.gradle
index d4fbce482e..daa4a04628 100644
--- a/grace-plugin-databinding/build.gradle
+++ b/grace-plugin-databinding/build.gradle
@@ -1,9 +1,9 @@
   dependencies {
-    api project(":grails-api")
-    api project(":grails-plugin-api")
-    api project(":grails-web-databinding")
+    api project(":grace-api")
+    api project(":grace-plugin-api")
+    api project(":grace-web-databinding")
 
     api libs.spring.boot.autoconfigure
 
-    testImplementation project(":grails-test-support")
+    testImplementation project(":grace-test-support")
 }
diff --git a/grace-plugin-datasource/build.gradle b/grace-plugin-datasource/build.gradle
index f1dae46f6d..f3e0d07d0d 100644
--- a/grace-plugin-datasource/build.gradle
+++ b/grace-plugin-datasource/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-    api project(":grails-core")
-    api project(':grails-plugin-api')
-    api project(":grails-spring-boot")
+    api project(":grace-core")
+    api project(':grace-plugin-api')
+    api project(":grace-spring-boot")
 
     api libs.gorm.datastore.core
     api libs.gorm.datastore.gorm
diff --git a/grace-plugin-domain-class/build.gradle b/grace-plugin-domain-class/build.gradle
index eadca8354c..18dfb42924 100644
--- a/grace-plugin-domain-class/build.gradle
+++ b/grace-plugin-domain-class/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    api project(":grails-core")
-    api project(":grails-plugin-api")
-    api project(":grails-plugin-validation")
-    api project(":grails-spring")
+    api project(":grace-core")
+    api project(":grace-plugin-api")
+    api project(":grace-plugin-validation")
+    api project(":grace-spring")
 
     api(libs.gorm.datastore.core) {
         transitive = false
diff --git a/grace-plugin-i18n/build.gradle b/grace-plugin-i18n/build.gradle
index e962767124..351a8ae520 100644
--- a/grace-plugin-i18n/build.gradle
+++ b/grace-plugin-i18n/build.gradle
@@ -1,10 +1,10 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(":grails-plugin-api")
-    api project(":grails-util")
-    api project(":grails-web-common")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(":grace-plugin-api")
+    api project(":grace-util")
+    api project(":grace-web-common")
 
     api libs.groovy.ant
     api libs.spring.boot.autoconfigure
diff --git a/grace-plugin-interceptors/build.gradle b/grace-plugin-interceptors/build.gradle
index 8348ccddde..93820e9193 100644
--- a/grace-plugin-interceptors/build.gradle
+++ b/grace-plugin-interceptors/build.gradle
@@ -1,10 +1,10 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(":grails-plugin-api")
-    api project(":grails-plugin-controllers")
-    api project(":grails-plugin-url-mappings")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(":grace-plugin-api")
+    api project(":grace-plugin-controllers")
+    api project(":grace-plugin-url-mappings")
 
     api libs.spring.boot.autoconfigure
 }
diff --git a/grace-plugin-mimetypes/build.gradle b/grace-plugin-mimetypes/build.gradle
index e3eadb3590..7072979cfb 100644
--- a/grace-plugin-mimetypes/build.gradle
+++ b/grace-plugin-mimetypes/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-plugin-api")
-    api project(":grails-web")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-plugin-api")
+    api project(":grace-web")
 
     api libs.spring.boot.autoconfigure
 }
diff --git a/grace-plugin-rest/build.gradle b/grace-plugin-rest/build.gradle
index 84007d6ac5..844e3f2047 100644
--- a/grace-plugin-rest/build.gradle
+++ b/grace-plugin-rest/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(':grails-plugin-api')
-    api project(":grails-plugin-controllers")
-    api project(":grails-plugin-converters")
-    api project(":grails-web-url-mappings")
-    api project(":grails-util")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(':grace-plugin-api')
+    api project(":grace-plugin-controllers")
+    api project(":grace-plugin-converters")
+    api project(":grace-web-url-mappings")
+    api project(":grace-util")
 
     api libs.javax.jaxb
     api libs.spring.boot.autoconfigure
@@ -23,6 +23,6 @@ dependencies {
     }
     implementation libs.caffeine
 
-    testImplementation project(":grails-plugin-url-mappings")
-    testImplementation project(":grails-test-suite-base")
+    testImplementation project(":grace-plugin-url-mappings")
+    testImplementation project(":grace-test-suite-base")
 }
diff --git a/grace-plugin-services/build.gradle b/grace-plugin-services/build.gradle
index da66049bf2..ac55458bc8 100644
--- a/grace-plugin-services/build.gradle
+++ b/grace-plugin-services/build.gradle
@@ -1,9 +1,9 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(':grails-plugin-api')
-    api project(':grails-util')
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(':grace-plugin-api')
+    api project(':grace-util')
 
     api libs.spring.tx
 }
diff --git a/grace-plugin-url-mappings/build.gradle b/grace-plugin-url-mappings/build.gradle
index c3455c8466..b7879720c7 100644
--- a/grace-plugin-url-mappings/build.gradle
+++ b/grace-plugin-url-mappings/build.gradle
@@ -1,10 +1,10 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(":grails-plugin-controllers")
-    api project(":grails-util")
-    api project(":grails-web-url-mappings")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(":grace-plugin-controllers")
+    api project(":grace-util")
+    api project(":grace-web-url-mappings")
 
     annotationProcessor libs.spring.boot.configurationProcessor
     api libs.spring.boot.autoconfigure
diff --git a/grace-plugin-validation/build.gradle b/grace-plugin-validation/build.gradle
index 712c666a4c..d700dbda17 100644
--- a/grace-plugin-validation/build.gradle
+++ b/grace-plugin-validation/build.gradle
@@ -1,9 +1,9 @@
 dependencies {
-    api project(":grails-core")
-    api project(":grails-util")
+    api project(":grace-core")
+    api project(":grace-util")
     api(libs.gorm.datastore.gorm.validation) {
         transitive = false
     }
 
-    testImplementation project(":grails-web-common")
+    testImplementation project(":grace-web-common")
 }
diff --git a/grace-shell/build.gradle b/grace-shell/build.gradle
index 3ae5285cd6..b423ade055 100644
--- a/grace-shell/build.gradle
+++ b/grace-shell/build.gradle
@@ -16,10 +16,10 @@ configurations {
 }
 
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-gradle-model")
-    api project(":grails-util")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-gradle-model")
+    api project(":grace-util")
 
     api libs.ant
     api libs.gradle.tooling.api
@@ -31,7 +31,7 @@ dependencies {
     api libs.spring.boot.cli, {
         exclude group: "org.codehaus.groovy", module: "groovy"
     }
-    dependenciesBom project(path: ":grails-bom", configuration: 'effectiveBom')
+    dependenciesBom project(path: ":grace-bom", configuration: 'effectiveBom')
     implementation(libs.maven.resolver.provider) {
         exclude group: "com.google.guava", module: "guava"
     }
diff --git a/grace-spring-boot/build.gradle b/grace-spring-boot/build.gradle
index 4cdc768580..7d7339d98e 100644
--- a/grace-spring-boot/build.gradle
+++ b/grace-spring-boot/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-util")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-util")
 
     api libs.spring.beans
     api libs.spring.boot
@@ -9,5 +9,5 @@ dependencies {
     api libs.spring.core
     api libs.spring.tx
 
-    testImplementation project(":grails-test-support")
+    testImplementation project(":grace-test-support")
 }
diff --git a/grace-test-suite-base/build.gradle b/grace-test-suite-base/build.gradle
index bb7c303b08..e76fb6b199 100644
--- a/grace-test-suite-base/build.gradle
+++ b/grace-test-suite-base/build.gradle
@@ -1,11 +1,11 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-bootstrap")
-    api project(":grails-core")
-    api project(":grails-plugin-converters")
-    api project(":grails-plugin-core")
-    api project(":grails-plugin-domain-class")
-    api project(":grails-spring")
-    api project(":grails-web")
-    api project(":grails-test")
+    api project(":grace-api")
+    api project(":grace-bootstrap")
+    api project(":grace-core")
+    api project(":grace-plugin-converters")
+    api project(":grace-plugin-core")
+    api project(":grace-plugin-domain-class")
+    api project(":grace-spring")
+    api project(":grace-web")
+    api project(":grace-test")
 }
diff --git a/grace-test-suite-persistence/build.gradle b/grace-test-suite-persistence/build.gradle
index 193ea86401..24ed2604a8 100644
--- a/grace-test-suite-persistence/build.gradle
+++ b/grace-test-suite-persistence/build.gradle
@@ -3,18 +3,18 @@ configurations.testCompileClasspath {
 }
 
 dependencies {
-    testImplementation project(":grails-boot")
-    testImplementation project(":grails-bootstrap")
-    testImplementation project(":grails-plugin-controllers")
-    testImplementation project(":grails-plugin-databinding")
-    testImplementation project(":grails-plugin-datasource")
-    testImplementation project(":grails-plugin-domain-class")
-    testImplementation project(":grails-plugin-i18n")
-    testImplementation project(":grails-plugin-services")
-    testImplementation project(":grails-plugin-url-mappings")
-    testImplementation project(":grails-spring")
-    testImplementation project(":grails-test-suite-base")
-    testImplementation project(":grails-test-support")
+    testImplementation project(":grace-boot")
+    testImplementation project(":grace-bootstrap")
+    testImplementation project(":grace-plugin-controllers")
+    testImplementation project(":grace-plugin-databinding")
+    testImplementation project(":grace-plugin-datasource")
+    testImplementation project(":grace-plugin-domain-class")
+    testImplementation project(":grace-plugin-i18n")
+    testImplementation project(":grace-plugin-services")
+    testImplementation project(":grace-plugin-url-mappings")
+    testImplementation project(":grace-spring")
+    testImplementation project(":grace-test-suite-base")
+    testImplementation project(":grace-test-support")
 
     testImplementation libs.grails.async, {
         exclude module:'grails-plugin-codecs'
diff --git a/grace-test-suite-uber/build.gradle b/grace-test-suite-uber/build.gradle
index 2c4a481972..b2015b4eb4 100644
--- a/grace-test-suite-uber/build.gradle
+++ b/grace-test-suite-uber/build.gradle
@@ -3,25 +3,25 @@ configurations.testCompileClasspath {
 }
 
 dependencies {
-    api project(":grails-api")
-    api project(":grails-util")
-    api project(":grails-test-suite-base")
-    api project(":grails-plugin-interceptors")
-    api project(":grails-plugin-controllers")
+    api project(":grace-api")
+    api project(":grace-util")
+    api project(":grace-test-suite-base")
+    api project(":grace-plugin-interceptors")
+    api project(":grace-plugin-controllers")
 
     api libs.tomcat.jdbc
 
-    testImplementation project(":grails-boot")
-    testImplementation project(":grails-plugin-codecs")
-    testImplementation project(":grails-plugin-domain-class")
-    testImplementation project(":grails-plugin-url-mappings")
-    testImplementation project(":grails-plugin-datasource")
-    testImplementation project(":grails-plugin-services")
-    testImplementation project(":grails-plugin-rest")
-    testImplementation project(":grails-plugin-i18n")
-    testImplementation project(":grails-plugin-databinding")
-    testImplementation project(":grails-spring")
-    testImplementation project(":grails-test-support")
+    testImplementation project(":grace-boot")
+    testImplementation project(":grace-plugin-codecs")
+    testImplementation project(":grace-plugin-domain-class")
+    testImplementation project(":grace-plugin-url-mappings")
+    testImplementation project(":grace-plugin-datasource")
+    testImplementation project(":grace-plugin-services")
+    testImplementation project(":grace-plugin-rest")
+    testImplementation project(":grace-plugin-i18n")
+    testImplementation project(":grace-plugin-databinding")
+    testImplementation project(":grace-spring")
+    testImplementation project(":grace-test-support")
     testImplementation libs.micronaut.spring.context
     testImplementation libs.gorm.datastore.gorm.hibernate5, {
         exclude group: 'org.grails', module:'grails-datastore-gorm'
diff --git a/grace-test-suite-web/build.gradle b/grace-test-suite-web/build.gradle
index e457037746..eb4e55c394 100644
--- a/grace-test-suite-web/build.gradle
+++ b/grace-test-suite-web/build.gradle
@@ -9,23 +9,23 @@ configurations.testCompileClasspath {
 }
 
 dependencies {
-    testImplementation project(":grails-boot")
-    testImplementation project(":grails-test-suite-base")
-    testImplementation project(":grails-plugin-domain-class")
-    testImplementation project(":grails-plugin-codecs")
-    testImplementation project(":grails-plugin-converters")
-    testImplementation project(":grails-plugin-datasource")
-    testImplementation project(":grails-plugin-i18n")
-    testImplementation project(":grails-plugin-url-mappings")
-    testImplementation project(":grails-plugin-databinding")
-    testImplementation project(":grails-plugin-services")
-    testImplementation project(":grails-plugin-interceptors")
-    testImplementation project(":grails-plugin-controllers")
-    testImplementation project(":grails-plugin-rest")
-    testImplementation project(":grails-web")
-    testImplementation project(":grails-web-databinding")
-    testImplementation project(":grails-spring")
-    testImplementation project(":grails-test-support")
+    testImplementation project(":grace-boot")
+    testImplementation project(":grace-test-suite-base")
+    testImplementation project(":grace-plugin-domain-class")
+    testImplementation project(":grace-plugin-codecs")
+    testImplementation project(":grace-plugin-converters")
+    testImplementation project(":grace-plugin-datasource")
+    testImplementation project(":grace-plugin-i18n")
+    testImplementation project(":grace-plugin-url-mappings")
+    testImplementation project(":grace-plugin-databinding")
+    testImplementation project(":grace-plugin-services")
+    testImplementation project(":grace-plugin-interceptors")
+    testImplementation project(":grace-plugin-controllers")
+    testImplementation project(":grace-plugin-rest")
+    testImplementation project(":grace-web")
+    testImplementation project(":grace-web-databinding")
+    testImplementation project(":grace-spring")
+    testImplementation project(":grace-test-support")
 
     testImplementation libs.javax.el
     testImplementation libs.javax.jsp
diff --git a/grace-test-support/build.gradle b/grace-test-support/build.gradle
index c6d6fcffe7..20fcf889c9 100755
--- a/grace-test-support/build.gradle
+++ b/grace-test-support/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
-    api project(":grails-plugin-codecs")
-    api project(":grails-plugin-core")
-    api project(":grails-plugin-databinding")
-    api project(":grails-plugin-domain-class")
-    api project(":grails-plugin-i18n")
-    api project(":grails-plugin-interceptors")
-    api project(":grails-plugin-rest")
-    api project(":grails-test")
+    api project(":grace-plugin-codecs")
+    api project(":grace-plugin-core")
+    api project(":grace-plugin-databinding")
+    api project(":grace-plugin-domain-class")
+    api project(":grace-plugin-i18n")
+    api project(":grace-plugin-interceptors")
+    api project(":grace-plugin-rest")
+    api project(":grace-test")
 
     api libs.grails.async, {
         exclude module: 'grails-plugin-controllers'
diff --git a/grace-test/build.gradle b/grace-test/build.gradle
index 6b1fe221f5..e46c3ebe57 100644
--- a/grace-test/build.gradle
+++ b/grace-test/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    api project(":grails-boot")
-    api project(":grails-plugin-converters")
-    api project(":grails-plugin-mimetypes")
-    api project(":grails-web")
+    api project(":grace-boot")
+    api project(":grace-plugin-converters")
+    api project(":grace-plugin-mimetypes")
+    api project(":grace-web")
 
     api libs.ant
     api libs.ant.junit
diff --git a/grace-web-boot/build.gradle b/grace-web-boot/build.gradle
index c18b26a1c3..f5e434ab07 100644
--- a/grace-web-boot/build.gradle
+++ b/grace-web-boot/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    api project(":grails-web-common")
+    api project(":grace-web-common")
 
-    testImplementation project(":grails-plugin-controllers")
+    testImplementation project(":grace-plugin-controllers")
     testImplementation libs.tomcat.embed.core
-    testRuntimeOnly project(":grails-plugin-i18n")
-    testRuntimeOnly project(":grails-plugin-url-mappings")
+    testRuntimeOnly project(":grace-plugin-i18n")
+    testRuntimeOnly project(":grace-plugin-url-mappings")
 }
diff --git a/grace-web-common/build.gradle b/grace-web-common/build.gradle
index b4bffc9a57..440111c535 100644
--- a/grace-web-common/build.gradle
+++ b/grace-web-common/build.gradle
@@ -1,9 +1,9 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-core")
-    api project(":grails-databinding")
-    api project(":grails-encoder")
-    api project(":grails-util")
+    api project(":grace-api")
+    api project(":grace-core")
+    api project(":grace-databinding")
+    api project(":grace-encoder")
+    api project(":grace-util")
 
     api libs.grails.gsp, {
         exclude group:'org.grails', module:'grails-core'
diff --git a/grace-web-databinding/build.gradle b/grace-web-databinding/build.gradle
index fed01f9636..6ad65073c5 100644
--- a/grace-web-databinding/build.gradle
+++ b/grace-web-databinding/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-    api project(":grails-databinding")
-    api project(":grails-util")
-    api project(":grails-web-common")
+    api project(":grace-databinding")
+    api project(":grace-util")
+    api project(":grace-web-common")
 
     api libs.gorm.datastore.core, {
         transitive = false
diff --git a/grace-web-mvc/build.gradle b/grace-web-mvc/build.gradle
index 55bac6d33b..3470f117cd 100644
--- a/grace-web-mvc/build.gradle
+++ b/grace-web-mvc/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    api project(":grails-web-common")
-    api project(":grails-web-url-mappings")
+    api project(":grace-web-common")
+    api project(":grace-web-url-mappings")
 
     api libs.grails.web.sitemesh, {
         exclude group:'org.grails', module:'grails-web-common'
diff --git a/grace-web-url-mappings/build.gradle b/grace-web-url-mappings/build.gradle
index eea977cd6f..c7c2c13caf 100644
--- a/grace-web-url-mappings/build.gradle
+++ b/grace-web-url-mappings/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-cli")
-    api project(":grails-util")
-    api project(":grails-web-common")
+    api project(":grace-api")
+    api project(":grace-cli")
+    api project(":grace-util")
+    api project(":grace-web-common")
 
     api(libs.gorm.datastore.gorm.validation) {
         transitive = false
@@ -12,7 +12,7 @@ dependencies {
     compileOnly libs.jansi
     compileOnly libs.jline
 
-    testImplementation project(":grails-test-suite-base")
+    testImplementation project(":grace-test-suite-base")
 }
 
 tasks.withType(Test) {
diff --git a/grace-web/build.gradle b/grace-web/build.gradle
index 91b3ab8999..47701f43c2 100644
--- a/grace-web/build.gradle
+++ b/grace-web/build.gradle
@@ -1,10 +1,10 @@
 dependencies {
-    api project(":grails-api")
-    api project(":grails-plugin-api")
-    api project(":grails-web-common")
-    api project(":grails-web-databinding")
-    api project(":grails-web-mvc")
-    api project(":grails-web-url-mappings")
+    api project(":grace-api")
+    api project(":grace-plugin-api")
+    api project(":grace-web-common")
+    api project(":grace-web-databinding")
+    api project(":grace-web-mvc")
+    api project(":grace-web-url-mappings")
 
     api libs.grails.web.gsp, {
         exclude group:'org.grails', module:'grails-core'
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 1fc7a47600..a692e738c5 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -4,9 +4,9 @@ apply plugin: org.grails.gradle.GrailsBuildPlugin
 
 def libsConfigurations = []
 subprojects { subproject ->
-    if(subproject.name == 'grails-dependencies') return
-    if(subproject.name == 'grails-bom') return
-    if(subproject.name == 'grails-shell' || subproject.name == 'grails-core') {
+    if(subproject.name == 'grace-dependencies') return
+    if(subproject.name == 'grace-bom') return
+    if(subproject.name == 'grace-shell' || subproject.name == 'grace-core') {
 
         configurations {
             libsConfigurations << libs {
@@ -132,23 +132,23 @@ task populateDependencies(type: Sync, dependsOn: configurePopulateDependencies)
 // Can't use sync task here because this directory contains other things as well.
 task sourcesJars(type: Sync) {
     into homeSrcDir
-    from subprojects.findAll { !it.name.startsWith('grails-test-suite') && !it.name.startsWith('grails-dependencies') && !it.name.startsWith('grails-bom') }.sourcesJar*.outputs*.files
+    from subprojects.findAll { !it.name.startsWith('grace-test-suite') && !it.name.startsWith('grace-dependencies') && !it.name.startsWith('grace-bom') }.sourcesJar*.outputs*.files
 
     // sourcesFor comes from GrailsBuildPlugin
-    from { sourcesFor(libsConfigurations*.copyRecursive { it.name.startsWith('grails-datastore') }.collect { it.transitive = false; it }) }
+    from { sourcesFor(libsConfigurations*.copyRecursive { it.name.startsWith('grace-datastore') }.collect { it.transitive = false; it }) }
 }
 
 task grailsCreateStartScripts(type: GrailsCreateStartScripts) {
-    description = "Creates OS specific scripts to run grails-shell as a JVM application."
+    description = "Creates OS specific scripts to run grace-shell as a JVM application."
     mainClass = 'org.grails.cli.GrailsCli'
-    applicationName = 'grails'
+    applicationName = 'grace'
     defaultJvmOpts = ["-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1", "-XX:CICompilerCount=3"]
     outputDir = file('bin')
-    classpath = rootProject.childProjects['grails-shell'].configurations.runtimeClasspath
-    projectArtifacts = rootProject.childProjects['grails-shell'].tasks['jar'].outputs.files.collect { "dist/${it.name}" }
+    classpath = rootProject.childProjects['grace-shell'].configurations.runtimeClasspath
+    projectArtifacts = rootProject.childProjects['grace-shell'].tasks['jar'].outputs.files.collect { "dist/${it.name}" }
     doLast {
-        ant.replace(file: file('bin/grails'), token: 'media/gradle.icns', value: 'media/icons/grails.icns')
-        ant.chmod(file: file('bin/grails'), perm: 'ugo+rx')
+        ant.replace(file: file('bin/grace'), token: 'media/gradle.icns', value: 'media/icons/grails.icns')
+        ant.chmod(file: file('bin/grace'), perm: 'ugo+rx')
     }
 }
 
@@ -159,7 +159,7 @@ class GrailsCreateStartScripts extends org.gradle.api.tasks.application.CreateSt
     @org.gradle.api.tasks.TaskAction
     void generate() {
         def generator = new org.gradle.api.internal.plugins.StartScriptGenerator()
-        generator.unixStartScriptGenerator.template = project.rootProject.childProjects['grails-shell'].resources.text.fromFile('src/main/resources/unixStartScript.txt')
+        generator.unixStartScriptGenerator.template = project.rootProject.childProjects['grace-shell'].resources.text.fromFile('src/main/resources/unixStartScript.txt')
         generator.applicationName = getApplicationName()
         generator.mainClassName = getMainClass().get()
         generator.defaultJvmOpts = getDefaultJvmOpts()
@@ -168,7 +168,7 @@ class GrailsCreateStartScripts extends org.gradle.api.tasks.application.CreateSt
         generator.classpath = projectArtifacts + getClasspath().resolvedConfiguration.resolvedArtifacts.collect { artifact ->
             def dependency = artifact.moduleVersion.id
             String installedFile = "lib/$dependency.group/$dependency.name/jars/$artifact.file.name"
-            if(dependency.group=='org.grails' && !project.file(installedFile).exists()) {
+            if(dependency.group=='org.graceframework' && !project.file(installedFile).exists()) {
                 installedFile = "dist/$artifact.file.name"
             }
             installedFile
@@ -181,7 +181,7 @@ class GrailsCreateStartScripts extends org.gradle.api.tasks.application.CreateSt
 
 task install(dependsOn: [populateDependencies, grailsCreateStartScripts]) { task ->
     subprojects { Project project ->
-        if(!project.name.startsWith('grails-test-suite')) {
+        if(!project.name.startsWith('grace-test-suite')) {
             task.dependsOn("$project.name:publishToMavenLocal")
         }
     }
@@ -191,14 +191,14 @@ task install(dependsOn: [populateDependencies, grailsCreateStartScripts]) { task
 
 task zipDist(type: Zip, dependsOn: [sourcesJars, install]) {
     destinationDirectory = "${buildDir}/distributions" as File
-    archiveBaseName = 'grails'
+    archiveBaseName = 'grace'
     archiveAppendix = grailsVersion
 
     exclude "**/CVS/**"
 
-    into("grails-$grailsVersion") {
+    into("grace-$grailsVersion") {
         from(projectDir) {
-            include 'bin/grails', 'bin/grails.bat', 'lib/', 'media/', 'samples/', 'scripts/', 'LICENSE', 'INSTALL', "src/"
+            include 'bin/grace', 'bin/grace.bat', 'lib/', 'samples/', 'scripts/', 'LICENSE', 'INSTALL', "src/"
             exclude 'ant/bin', 'src/grails', 'src/war'
         }
         from(docs.destinationDir) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ff1ff8e7e3..f0b71e49d9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,16 +8,16 @@ cglib = "3.3.0"
 commons-codec = "1.15"
 commons-lang = "2.6"
 commons-lang3 = "3.12.0"
-gorm = "7.2.2-SNAPSHOT"
-gorm-hibernate = "7.2.3-SNAPSHOT"
+gorm = "7.2.1"
+gorm-hibernate = "7.2.2"
 gradle = "7.5.1"
 gradle-extra-configurations-plugin = "7.0.0"
 gradle-nexus-plugin = "2.3.1"
 gradle-nexus-publish-plugin = "1.1.0"
-grails-async = "5.0.0-SNAPSHOT"
+grails-async = "4.0.0"
 grails-gdoc = "1.0.1"
-grails-gsp = "5.2.2-SNAPSHOT"
-grails-scaffolding = "5.0.0-SNAPSHOT"
+grails-gsp = "5.2.2"
+grails-scaffolding = "2.1.0"
 grails-views = "2.3.2"
 groovy = "3.0.12"
 gson = "2.9.0"
diff --git a/settings.gradle b/settings.gradle
index f514255bb0..b3ef33042f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,88 +1,88 @@
-plugins {
-    id "com.gradle.enterprise" version "3.8.1"
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.6.3'
-}
+// plugins {
+//     id "com.gradle.enterprise" version "3.8.1"
+//     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.6.3'
+// }
 
-gradleEnterprise {
-    server = 'https://ge.grails.org'
-    buildScan {
-        publishAlways()
-        publishIfAuthenticated()
-        uploadInBackground = System.getenv("CI") == null
-        capture {
-            taskInputFiles = true
-        }
-    }
+// gradleEnterprise {
+//     server = 'https://ge.grails.org'
+//     buildScan {
+//         publishAlways()
+//         publishIfAuthenticated()
+//         uploadInBackground = System.getenv("CI") == null
+//         capture {
+//             taskInputFiles = true
+//         }
+//     }
 
-}
+// }
 
-buildCache {
-    local { enabled = System.getenv('CI') != 'true' }
-    remote(HttpBuildCache) {
-        push = System.getenv('CI') == 'true'
-        enabled = true
-        url = 'https://ge.grails.org/cache/'
-        credentials {
-            username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER')
-            password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')
-        }
-    }}
+// buildCache {
+//     local { enabled = System.getenv('CI') != 'true' }
+//     remote(HttpBuildCache) {
+//         push = System.getenv('CI') == 'true'
+//         enabled = true
+//         url = 'https://ge.grails.org/cache/'
+//         credentials {
+//             username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER')
+//             password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')
+//         }
+//     }}
 
-rootProject.name = "grails.core.ROOT"
+rootProject.name = "Grace.Framework"
 
 include (
-        'grails-api',
-        'grails-boot',
-        'grails-bootstrap',
-        'grails-cli',
-        'grails-codecs',
-        'grails-console',
-        'grails-core',
-        'grails-databinding',
-        'grails-docs',
-        'grails-encoder',
-        'grails-logging',
-        'grails-shell',
-        'grails-spring',
-        'grails-spring-boot',
-        'grails-test',
-        'grails-test-support',
-        'grails-util',
-        'grails-web',
-        'grails-web-common',
-        'grails-web-boot',
-        'grails-web-databinding',
-        'grails-web-mvc',
-        'grails-web-url-mappings',
+        'grace-api',
+        'grace-boot',
+        'grace-bootstrap',
+        'grace-cli',
+        'grace-codecs',
+        'grace-console',
+        'grace-core',
+        'grace-databinding',
+        'grace-docs',
+        'grace-encoder',
+        'grace-logging',
+        'grace-shell',
+        'grace-spring',
+        'grace-spring-boot',
+        'grace-test',
+        'grace-test-support',
+        'grace-util',
+        'grace-web',
+        'grace-web-common',
+        'grace-web-boot',
+        'grace-web-databinding',
+        'grace-web-mvc',
+        'grace-web-url-mappings',
 
         // POM / BOMs
-        'grails-dependencies',
-        'grails-bom',
+        'grace-dependencies',
+        'grace-bom',
 
         // Plugins
-        'grails-plugin-api',
-        'grails-plugin-codecs',
-        'grails-plugin-controllers',
-        'grails-plugin-converters',
-        'grails-plugin-core',
-        'grails-plugin-databinding',
-        'grails-plugin-datasource',
-        'grails-plugin-domain-class',
-        'grails-plugin-interceptors',
-        'grails-plugin-i18n',
-        'grails-plugin-mimetypes',
-        'grails-plugin-rest',
-        'grails-plugin-services',
-        'grails-plugin-url-mappings',
-        'grails-plugin-validation',
+        'grace-plugin-api',
+        'grace-plugin-codecs',
+        'grace-plugin-controllers',
+        'grace-plugin-converters',
+        'grace-plugin-core',
+        'grace-plugin-databinding',
+        'grace-plugin-datasource',
+        'grace-plugin-domain-class',
+        'grace-plugin-interceptors',
+        'grace-plugin-i18n',
+        'grace-plugin-mimetypes',
+        'grace-plugin-rest',
+        'grace-plugin-services',
+        'grace-plugin-url-mappings',
+        'grace-plugin-validation',
 
         // Test Suite
-        'grails-test-suite-base',
-        'grails-test-suite-persistence',
-        'grails-test-suite-uber',
-        'grails-test-suite-web',
+        'grace-test-suite-base',
+        'grace-test-suite-persistence',
+        'grace-test-suite-uber',
+        'grace-test-suite-web',
 
         // Gradle Plugin
-        'grails-gradle-model',
-        'grails-gradle-plugin'
+        'grace-gradle-model',
+        'grace-gradle-plugin'
 )
\ No newline at end of file