diff --git a/grails-console/src/main/groovy/grails/ui/command/GrailsApplicationContextCommandRunner.groovy b/grails-console/src/main/groovy/grails/ui/command/GrailsApplicationCommandRunner.groovy
similarity index 91%
rename from grails-console/src/main/groovy/grails/ui/command/GrailsApplicationContextCommandRunner.groovy
rename to grails-console/src/main/groovy/grails/ui/command/GrailsApplicationCommandRunner.groovy
index b2efbcfd6a..2e47275318 100644
--- a/grails-console/src/main/groovy/grails/ui/command/GrailsApplicationContextCommandRunner.groovy
+++ b/grails-console/src/main/groovy/grails/ui/command/GrailsApplicationCommandRunner.groovy
@@ -23,7 +23,7 @@ import grails.config.Settings
 import grails.dev.commands.ApplicationCommand
 import grails.dev.commands.ApplicationContextCommandRegistry
 import grails.dev.commands.ExecutionContext
-import grails.ui.support.DevelopmentGrailsApplication
+import grails.ui.support.DevelopmentGrails
 
 import org.grails.build.parsing.CommandLine
 import org.grails.build.parsing.CommandLineParser
@@ -33,11 +33,11 @@ import org.grails.build.parsing.CommandLineParser
  * @since 3.0
  */
 @CompileStatic
-class GrailsApplicationContextCommandRunner extends DevelopmentGrailsApplication {
+class GrailsApplicationCommandRunner extends DevelopmentGrails {
 
     String commandName
 
-    protected GrailsApplicationContextCommandRunner(String commandName, Class<?>... sources) {
+    protected GrailsApplicationCommandRunner(String commandName, Class<?>... sources) {
         super(sources)
         this.commandName = commandName
     }
@@ -102,7 +102,7 @@ class GrailsApplicationContextCommandRunner extends DevelopmentGrailsApplication
                 System.exit(1)
             }
 
-            GrailsApplicationContextCommandRunner runner = new GrailsApplicationContextCommandRunner(args[0], applicationClass)
+            GrailsApplicationCommandRunner runner = new GrailsApplicationCommandRunner(args[0], applicationClass)
             runner.run(args.init() as String[])
         }
         else {
diff --git a/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy b/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy
index 7471e2c53e..6e1d665d57 100644
--- a/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy
+++ b/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package grails.ui.console.support
 import groovy.transform.CompileStatic
 import groovy.transform.InheritConstructors
 
-import grails.ui.support.DevelopmentWebApplicationContext
+import grails.ui.support.DevelopmentGrailsApplicationContext
 
 /**
  * A {@org.springframework.web.context.WebApplicationContext} for use in the embedded Grails console
@@ -28,6 +28,6 @@ import grails.ui.support.DevelopmentWebApplicationContext
  */
 @InheritConstructors
 @CompileStatic
-class GroovyConsoleWebApplicationContext extends DevelopmentWebApplicationContext {
+class GroovyConsoleWebApplicationContext extends DevelopmentGrailsApplicationContext {
 
 }
diff --git a/grails-console/src/main/groovy/grails/ui/script/GrailsApplicationScriptRunner.groovy b/grails-console/src/main/groovy/grails/ui/script/GrailsApplicationScriptRunner.groovy
index d62216cf3c..1e19625187 100644
--- a/grails-console/src/main/groovy/grails/ui/script/GrailsApplicationScriptRunner.groovy
+++ b/grails-console/src/main/groovy/grails/ui/script/GrailsApplicationScriptRunner.groovy
@@ -23,7 +23,7 @@ import org.springframework.context.ConfigurableApplicationContext
 import grails.config.Config
 import grails.core.GrailsApplication
 import grails.persistence.support.PersistenceContextInterceptor
-import grails.ui.support.DevelopmentGrailsApplication
+import grails.ui.support.DevelopmentGrails
 
 /**
  * Used to run Grails scripts within the context of a Grails application
@@ -32,7 +32,7 @@ import grails.ui.support.DevelopmentGrailsApplication
  * @since 3.0
  */
 @CompileStatic
-class GrailsApplicationScriptRunner extends DevelopmentGrailsApplication {
+class GrailsApplicationScriptRunner extends DevelopmentGrails {
 
     List<File> scripts
 
diff --git a/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy b/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy
index 1b31d12404..3fd052600f 100644
--- a/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy
+++ b/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package grails.ui.shell.support
 import groovy.transform.CompileStatic
 import groovy.transform.InheritConstructors
 
-import grails.ui.support.DevelopmentWebApplicationContext
+import grails.ui.support.DevelopmentGrailsApplicationContext
 
 /**
  * @author Graeme Rocher
@@ -26,7 +26,7 @@ import grails.ui.support.DevelopmentWebApplicationContext
  */
 @CompileStatic
 @InheritConstructors
-class GroovyshWebApplicationContext extends DevelopmentWebApplicationContext {
+class GroovyshWebApplicationContext extends DevelopmentGrailsApplicationContext {
 
     @Override
     protected void finishRefresh() {
diff --git a/grails-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplication.groovy b/grails-console/src/main/groovy/grails/ui/support/DevelopmentGrails.groovy
similarity index 85%
rename from grails-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplication.groovy
rename to grails-console/src/main/groovy/grails/ui/support/DevelopmentGrails.groovy
index 3b6dd78001..7fdf08dd94 100644
--- a/grails-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplication.groovy
+++ b/grails-console/src/main/groovy/grails/ui/support/DevelopmentGrails.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,16 +27,16 @@ import grails.boot.Grails
  * @since 3.0
  */
 @CompileStatic
-class DevelopmentGrailsApplication extends Grails {
+class DevelopmentGrails extends Grails {
 
-    protected DevelopmentGrailsApplication(Class<?>... sources) {
+    protected DevelopmentGrails(Class<?>... sources) {
         super(sources)
         configureApplicationContextClass()
     }
 
     protected configureApplicationContextClass() {
         if (ClassUtils.isPresent('javax.servlet.ServletContext', Thread.currentThread().contextClassLoader)) {
-            setApplicationContextFactory(ApplicationContextFactory.ofContextClass(DevelopmentWebApplicationContext))
+            setApplicationContextFactory(ApplicationContextFactory.ofContextClass(DevelopmentGrailsApplicationContext))
         }
         else {
             setApplicationContextFactory(ApplicationContextFactory.ofContextClass(GenericWebApplicationContext))
diff --git a/grails-console/src/main/groovy/grails/ui/support/DevelopmentWebApplicationContext.groovy b/grails-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplicationContext.groovy
similarity index 90%
rename from grails-console/src/main/groovy/grails/ui/support/DevelopmentWebApplicationContext.groovy
rename to grails-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplicationContext.groovy
index bf2cbd8214..0a2094253d 100644
--- a/grails-console/src/main/groovy/grails/ui/support/DevelopmentWebApplicationContext.groovy
+++ b/grails-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplicationContext.groovy
@@ -26,6 +26,6 @@ import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebSe
  * @since
  */
 @InheritConstructors
-class DevelopmentWebApplicationContext extends AnnotationConfigServletWebServerApplicationContext {
+class DevelopmentGrailsApplicationContext extends AnnotationConfigServletWebServerApplicationContext {
 
 }
diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextCommandTask.groovy b/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextCommandTask.groovy
index 9fd13bd4dd..b3bbbadcbe 100644
--- a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextCommandTask.groovy
+++ b/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextCommandTask.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.gradle.api.tasks.JavaExec
 class ApplicationContextCommandTask extends JavaExec {
 
     ApplicationContextCommandTask() {
-        getMainClass().set('grails.ui.command.GrailsApplicationContextCommandRunner')
+        getMainClass().set('grails.ui.command.GrailsApplicationCommandRunner')
         dependsOn('classes', 'findMainClass')
         systemProperties(System.properties.findAll { it.key.toString().startsWith('grails.') } as Map<String, Object>)
     }