diff --git a/grace-gradle-plugin/build.gradle b/grace-gradle-plugin/build.gradle
index 9d1c6561f9..760cf70808 100644
--- a/grace-gradle-plugin/build.gradle
+++ b/grace-gradle-plugin/build.gradle
@@ -38,49 +38,49 @@ dependencies {
 
 gradlePlugin {
     plugins {
-        grailsCore {
+        graceCore {
             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 {
+        graceDoc {
             displayName = "Grace Doc Gradle Plugin"
             description = 'Adds Grace doc publishing support'
             id = 'org.graceframework.grace-doc'
             implementationClass = 'org.grails.gradle.plugin.doc.GrailsDocGradlePlugin'
         }
-        grailsGsp {
+        graceGsp {
             displayName = "Grace GSP Gradle Plugin"
             description = 'A plugin that adds support for compiling Groovy Server Pages (GSP)'
             id = 'org.graceframework.grace-gsp'
             implementationClass = 'org.grails.gradle.plugin.web.gsp.GroovyPagePlugin'
         }
-        grailsPlugin {
+        gracePlugin {
             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 {
+        graceProfile {
             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 {
+        graceWeb {
             displayName = "Grace Web Gradle Plugin"
             description = 'Adds web specific extensions'
             id = 'org.graceframework.grace-web'
             implementationClass = 'org.grails.gradle.plugin.web.GrailsWebGradlePlugin'
         }
-        grailsPluginPublish {
+        gracePluginPublish {
             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 {
+        graceProfilePublish {
             displayName = "Grace Profile Publish Plugin"
             description = 'A plugin for publishing profiles'
             id = 'org.graceframework.internal.grace-profile-publish'
diff --git a/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-core.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-core.properties
similarity index 100%
rename from grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-core.properties
rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-core.properties
diff --git a/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-doc.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-doc.properties
similarity index 100%
rename from grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-doc.properties
rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-doc.properties
diff --git a/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-gsp.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-gsp.properties
similarity index 100%
rename from grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-gsp.properties
rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-gsp.properties
diff --git a/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-plugin.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-plugin.properties
similarity index 100%
rename from grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-plugin.properties
rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-plugin.properties
diff --git a/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-profile.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-profile.properties
similarity index 100%
rename from grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-profile.properties
rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-profile.properties
diff --git a/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-web.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-web.properties
similarity index 100%
rename from grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-web.properties
rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.grace-web.properties
diff --git a/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-plugin-publish.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.internal.grace-plugin-publish.properties
similarity index 100%
rename from grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-plugin-publish.properties
rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.internal.grace-plugin-publish.properties
diff --git a/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-profile-publish.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.internal.grace-profile-publish.properties
similarity index 100%
rename from grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-profile-publish.properties
rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graceframework.internal.grace-profile-publish.properties