diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy b/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy
index 42c43fa8242..7b332293d34 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy
@@ -97,7 +97,8 @@ class GroovyPageCompiler {
             packageDir += generateJavaName(relPackagePath)
         }
 
-        def className = packageDir.replace('/','_')
+        def className = generateJavaName(packageDir.replace('/','_'))
+
         className += generateJavaName(gspfile.name)
         // using default package because of GRAILS-5022
         packageDir = ''