diff --git a/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/GroovySensor.java b/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/GroovySensor.java
index 9e298d35..5e857f87 100644
--- a/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/GroovySensor.java
+++ b/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/GroovySensor.java
@@ -261,7 +261,7 @@ public static List<Object> getExtensions() {
                     + "Thus metrics such as \"Comment lines\" do not get incremented. "
                     + "If set to \"false\", those file headers are considered as comments and metrics such as \"Comment lines\" get incremented.")
             .category(Groovy.NAME)
-            .subCategory("General")
+            .subCategory("Base")
             .onQualifiers(Qualifiers.PROJECT)
             .defaultValue("true")
             .type(PropertyType.BOOLEAN)
diff --git a/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/foundation/Groovy.java b/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/foundation/Groovy.java
index 7a61baa1..79c952fa 100644
--- a/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/foundation/Groovy.java
+++ b/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/foundation/Groovy.java
@@ -81,7 +81,7 @@ public static List<Object> getExtensions() {
             .description(
                 "Comma-separated list of suffixes for files to analyze. To not filter, leave the list empty.")
             .category(Groovy.NAME)
-            .subCategory("General")
+            .subCategory("Base")
             .onQualifiers(Qualifiers.PROJECT)
             .defaultValue(DEFAULT_FILE_SUFFIXES)
             .multiValues(true)