diff --git a/spring-rewrite-commons-gradle/pom.xml b/spring-rewrite-commons-gradle/pom.xml
index b32f351..c5fabef 100644
--- a/spring-rewrite-commons-gradle/pom.xml
+++ b/spring-rewrite-commons-gradle/pom.xml
@@ -22,9 +22,9 @@
     </properties>
 
     <modules>
-        <module>rewrite-gradle-model</module>
-        <module>rewrite-gradle-plugin</module>
-        <module>rewrite-gradle-parser</module>
+        <module>spring-rewrite-commons-rewrite-gradle-model</module>
+        <module>spring-rewrite-commons-rewrite-gradle-plugin</module>
+        <module>spring-rewrite-commons-rewrite-gradle-parser</module>
     </modules>
 
     <repositories>
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/pom.xml b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml
similarity index 88%
rename from spring-rewrite-commons-gradle/rewrite-gradle-model/pom.xml
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml
index 217aee1..67da252 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-model/pom.xml
+++ b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml
@@ -9,20 +9,21 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>rewrite-gradle-model</artifactId>
+    <artifactId>spring-rewrite-commons-rewrite-gradle-model</artifactId>
     <name>Spring Rewrite Gradle Tooling Model</name>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <gradle-tooling-model.version>1.1.2</gradle-tooling-model.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.openrewrite.gradle.tooling</groupId>
             <artifactId>model</artifactId>
-            <version>1.1.2</version>
+            <version>${gradle-tooling-model.version}</version>
         </dependency>
         <dependency>
             <groupId>org.gradle</groupId>
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/GradleProjectData.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/GradleProjectData.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/GradleProjectData.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/GradleProjectData.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/JavaSourceSetData.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/JavaSourceSetData.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/JavaSourceSetData.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/JavaSourceSetData.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/JavaVersionData.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/JavaVersionData.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/JavaVersionData.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/JavaVersionData.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/KotlinSourceSetData.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/KotlinSourceSetData.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/KotlinSourceSetData.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/KotlinSourceSetData.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java
similarity index 92%
rename from spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java
index 445ab2c..465a525 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java
+++ b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java
@@ -33,7 +33,7 @@ import java.util.List;
 public class SpringRewriteModelBuilder {
 
 	public static <T> T forProjectDirectory(Class<T> type, File projectDir, File buildFile) {
-		DefaultGradleConnector connector = (DefaultGradleConnector) GradleConnector.newConnector();
+		var connector = (DefaultGradleConnector) GradleConnector.newConnector();
 		if (Files.exists(projectDir.toPath().resolve("gradle/wrapper/gradle-wrapper.properties"))) {
 			connector.useBuildDistribution();
 		}
@@ -51,7 +51,7 @@ public class SpringRewriteModelBuilder {
 		arguments.add(init.toString());
 		try (ProjectConnection connection = connector.connect()) {
 			ModelBuilder<T> customModelBuilder = connection.model(type);
-			try (InputStream is = SpringRewriteModelBuilder.class.getResourceAsStream("/init-spring-rewrite.gradle")) {
+			try (var is = SpringRewriteModelBuilder.class.getResourceAsStream("/init-spring-rewrite.gradle")) {
 				if (is == null) {
 					throw new IllegalStateException("Expected to find init.gradle on the classpath");
 				}
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/resources/init-spring-rewrite.gradle b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/resources/init-spring-rewrite.gradle
similarity index 81%
rename from spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/resources/init-spring-rewrite.gradle
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/resources/init-spring-rewrite.gradle
index 9d0f67d..2c48976 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/resources/init-spring-rewrite.gradle
+++ b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/src/main/resources/init-spring-rewrite.gradle
@@ -27,8 +27,8 @@ initscript{
     }
 
     dependencies{
-        classpath 'org.springframework.rewrite:rewrite-gradle-plugin:latest.integration'
-        classpath 'org.springframework.rewrite:rewrite-gradle-model:latest.integration'
+        classpath 'org.springframework.rewrite:spring-rewrite-commons-rewrite-gradle-plugin:latest.integration'
+        classpath 'org.springframework.rewrite:spring-rewrite-commons-rewrite-gradle-model:latest.integration'
     }
 }
 
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/pom.xml b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/pom.xml
similarity index 95%
rename from spring-rewrite-commons-gradle/rewrite-gradle-parser/pom.xml
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/pom.xml
index 947122a..01d37a8 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-parser/pom.xml
+++ b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/pom.xml
@@ -9,7 +9,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>rewrite-gradle-parser</artifactId>
+    <artifactId>spring-rewrite-commons-rewrite-gradle-parser</artifactId>
     <name>Spring Rewrite Gradle Project Parser</name>
 
     <properties>
@@ -21,10 +21,9 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.rewrite</groupId>
-            <artifactId>rewrite-gradle-model</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <artifactId>spring-rewrite-commons-rewrite-gradle-model</artifactId>
+            <version>${project.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/dev.gradleplugins/gradle-api -->
         <dependency>
             <groupId>dev.gradleplugins</groupId>
             <artifactId>gradle-api</artifactId>
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/Options.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/Options.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/Options.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/Options.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/ProjectParser.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/ProjectParser.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/ProjectParser.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/ProjectParser.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/ProjectParserTest.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/ProjectParserTest.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/ProjectParserTest.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/ProjectParserTest.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/Utils.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/Utils.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/Utils.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/Utils.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/model/GradleProjectDataTest.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/model/GradleProjectDataTest.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/model/GradleProjectDataTest.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/model/GradleProjectDataTest.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/resources/build.gradle b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/resources/build.gradle
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/resources/build.gradle
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/resources/build.gradle
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/resources/settings.gradle b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/resources/settings.gradle
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/resources/settings.gradle
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/src/test/resources/settings.gradle
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/pom.xml b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/pom.xml
similarity index 91%
rename from spring-rewrite-commons-gradle/rewrite-gradle-plugin/pom.xml
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/pom.xml
index 8849466..fdddd5f 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/pom.xml
+++ b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/pom.xml
@@ -9,7 +9,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>rewrite-gradle-plugin</artifactId>
+    <artifactId>spring-rewrite-commons-rewrite-gradle-plugin</artifactId>
     <name>Spring Rewrite Gradle Plugin</name>
 
     <properties>
@@ -22,8 +22,8 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.rewrite</groupId>
-            <artifactId>rewrite-gradle-model</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <artifactId>spring-rewrite-commons-rewrite-gradle-model</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/SpringRewritePlugin.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/SpringRewritePlugin.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/SpringRewritePlugin.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/SpringRewritePlugin.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleProjectDataImpl.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleProjectDataImpl.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleProjectDataImpl.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleProjectDataImpl.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiProjectBuilder.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiProjectBuilder.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiProjectBuilder.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiProjectBuilder.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiSettingsBuilder.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiSettingsBuilder.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiSettingsBuilder.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiSettingsBuilder.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/JavaSourceSetDataImpl.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/JavaSourceSetDataImpl.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/JavaSourceSetDataImpl.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/JavaSourceSetDataImpl.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/JavaVersionDataImpl.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/JavaVersionDataImpl.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/JavaVersionDataImpl.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/JavaVersionDataImpl.java
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/KotlinSourceSetDataImpl.java b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/KotlinSourceSetDataImpl.java
similarity index 100%
rename from spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/KotlinSourceSetDataImpl.java
rename to spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/KotlinSourceSetDataImpl.java