diff --git a/pom.xml b/pom.xml
index d5b88bb..eb40c80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,9 @@
 
         <!-- Module Dependency Versions -->
         <assertj.version>3.27.7</assertj.version>
-        <base.version>0.29.0</base.version>
+        <base.version>0.30.0</base.version>
         <byte-buddy.version>1.18.4</byte-buddy.version>
-        <codemodel.version>0.25.0</codemodel.version>
+        <codemodel.version>0.26.0</codemodel.version>
         <junit.version>6.0.3</junit.version>
         <jakarta-inject.version>2.0.1</jakarta-inject.version>
         <mockito.version>5.23.0</mockito.version>
@@ -226,12 +226,12 @@
             </dependency>
             <dependency>
                 <groupId>build.codemodel</groupId>
-                <artifactId>dependency-injection</artifactId>
+                <artifactId>codemodel-dependency-injection</artifactId>
                 <version>${codemodel.version}</version>
             </dependency>
             <dependency>
                 <groupId>build.codemodel</groupId>
-                <artifactId>jdk-codemodel</artifactId>
+                <artifactId>codemodel-jdk</artifactId>
                 <version>${codemodel.version}</version>
             </dependency>
 
diff --git a/spawn-application/pom.xml b/spawn-application/pom.xml
index bce571e..e1d31c2 100644
--- a/spawn-application/pom.xml
+++ b/spawn-application/pom.xml
@@ -83,12 +83,12 @@
 
         <dependency>
             <groupId>build.codemodel</groupId>
-            <artifactId>dependency-injection</artifactId>
+            <artifactId>codemodel-dependency-injection</artifactId>
         </dependency>
 
         <dependency>
             <groupId>build.codemodel</groupId>
-            <artifactId>jdk-codemodel</artifactId>
+            <artifactId>codemodel-jdk</artifactId>
         </dependency>
 
         <dependency>
diff --git a/spawn-application/src/main/java/build/spawn/application/AbstractTemplatedLauncher.java b/spawn-application/src/main/java/build/spawn/application/AbstractTemplatedLauncher.java
index 87daaf2..95748f1 100644
--- a/spawn-application/src/main/java/build/spawn/application/AbstractTemplatedLauncher.java
+++ b/spawn-application/src/main/java/build/spawn/application/AbstractTemplatedLauncher.java
@@ -32,12 +32,12 @@
 import build.base.table.option.CellSeparator;
 import build.base.table.option.RowComparator;
 import build.base.table.option.TableName;
+import build.codemodel.dependency.injection.Binding;
+import build.codemodel.dependency.injection.Context;
+import build.codemodel.dependency.injection.Dependency;
+import build.codemodel.dependency.injection.Resolver;
+import build.codemodel.dependency.injection.ValueBinding;
 import build.codemodel.foundation.usage.GenericTypeUsage;
-import build.codemodel.injection.Binding;
-import build.codemodel.injection.Context;
-import build.codemodel.injection.Dependency;
-import build.codemodel.injection.Resolver;
-import build.codemodel.injection.ValueBinding;
 import build.spawn.application.facet.Facet;
 import build.spawn.application.facet.Faceted;
 import build.spawn.application.option.Argument;
diff --git a/spawn-application/src/main/java/build/spawn/application/AbstractTemplatedPlatform.java b/spawn-application/src/main/java/build/spawn/application/AbstractTemplatedPlatform.java
index ac34706..4e67cf6 100644
--- a/spawn-application/src/main/java/build/spawn/application/AbstractTemplatedPlatform.java
+++ b/spawn-application/src/main/java/build/spawn/application/AbstractTemplatedPlatform.java
@@ -35,11 +35,11 @@
 import build.base.option.TemporaryDirectory;
 import build.base.option.WorkingDirectory;
 import build.base.table.Table;
+import build.codemodel.dependency.injection.ConfigurationResolver;
+import build.codemodel.dependency.injection.Context;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.codemodel.foundation.naming.CachingNameProvider;
 import build.codemodel.foundation.naming.NonCachingNameProvider;
-import build.codemodel.injection.ConfigurationResolver;
-import build.codemodel.injection.Context;
-import build.codemodel.injection.InjectionFramework;
 import build.codemodel.jdk.JDKCodeModel;
 import build.spawn.application.option.LaunchIdentity;
 
diff --git a/spawn-application/src/main/java/build/spawn/application/TemplatedPlatform.java b/spawn-application/src/main/java/build/spawn/application/TemplatedPlatform.java
index 233025a..2a82df6 100644
--- a/spawn-application/src/main/java/build/spawn/application/TemplatedPlatform.java
+++ b/spawn-application/src/main/java/build/spawn/application/TemplatedPlatform.java
@@ -21,8 +21,8 @@
  */
 
 import build.base.configuration.Configuration;
-import build.codemodel.injection.Context;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.Context;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.codemodel.jdk.JDKCodeModel;
 
 /**
diff --git a/spawn-application/src/main/java/build/spawn/application/facet/Facet.java b/spawn-application/src/main/java/build/spawn/application/facet/Facet.java
index cb76043..70001cc 100644
--- a/spawn-application/src/main/java/build/spawn/application/facet/Facet.java
+++ b/spawn-application/src/main/java/build/spawn/application/facet/Facet.java
@@ -22,7 +22,7 @@
 
 import build.base.configuration.CollectedOption;
 import build.base.foundation.Preconditions;
-import build.codemodel.injection.Context;
+import build.codemodel.dependency.injection.Context;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/spawn-application/src/main/java/build/spawn/application/facet/Faceted.java b/spawn-application/src/main/java/build/spawn/application/facet/Faceted.java
index 1347e17..bd1cfcc 100644
--- a/spawn-application/src/main/java/build/spawn/application/facet/Faceted.java
+++ b/spawn-application/src/main/java/build/spawn/application/facet/Faceted.java
@@ -20,7 +20,7 @@
  * #L%
  */
 
-import build.codemodel.injection.Context;
+import build.codemodel.dependency.injection.Context;
 
 import java.util.Optional;
 
diff --git a/spawn-application/src/main/java/build/spawn/application/facet/FacetedInvocationHandler.java b/spawn-application/src/main/java/build/spawn/application/facet/FacetedInvocationHandler.java
index c5d26c6..15bf9ee 100644
--- a/spawn-application/src/main/java/build/spawn/application/facet/FacetedInvocationHandler.java
+++ b/spawn-application/src/main/java/build/spawn/application/facet/FacetedInvocationHandler.java
@@ -20,7 +20,7 @@
  * #L%
  */
 
-import build.codemodel.injection.Context;
+import build.codemodel.dependency.injection.Context;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/spawn-application/src/main/java/module-info.java b/spawn-application/src/main/java/module-info.java
index 6f109d2..5114aa6 100644
--- a/spawn-application/src/main/java/module-info.java
+++ b/spawn-application/src/main/java/module-info.java
@@ -36,7 +36,7 @@
     requires transitive build.base.network;
     requires transitive build.base.option;
 
-    requires transitive build.codemodel.injection;
+    requires transitive build.codemodel.dependency.injection;
     requires transitive build.codemodel.jdk;
     requires transitive build.codemodel.foundation;
 
diff --git a/spawn-application/src/test/java/build/spawn/application/facet/FacetedTests.java b/spawn-application/src/test/java/build/spawn/application/facet/FacetedTests.java
index 9ffc022..406ab13 100644
--- a/spawn-application/src/test/java/build/spawn/application/facet/FacetedTests.java
+++ b/spawn-application/src/test/java/build/spawn/application/facet/FacetedTests.java
@@ -2,7 +2,7 @@
 
 import build.base.foundation.iterator.matching.IteratorPatternMatchers;
 import build.codemodel.foundation.naming.NonCachingNameProvider;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.codemodel.jdk.JDKCodeModel;
 import build.spawn.application.facet.facets.Address;
 import build.spawn.application.facet.facets.Hobbies;
diff --git a/spawn-docker-jdk/pom.xml b/spawn-docker-jdk/pom.xml
index 0e91b15..0b9799c 100644
--- a/spawn-docker-jdk/pom.xml
+++ b/spawn-docker-jdk/pom.xml
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>build.codemodel</groupId>
-            <artifactId>dependency-injection</artifactId>
+            <artifactId>codemodel-dependency-injection</artifactId>
         </dependency>
 
 
@@ -97,7 +97,7 @@
 
         <dependency>
             <groupId>build.codemodel</groupId>
-            <artifactId>jdk-codemodel</artifactId>
+            <artifactId>codemodel-jdk</artifactId>
         </dependency>
 
         <dependency>
@@ -134,7 +134,7 @@
                 <configuration>
                     <ignoredNonTestScopedDependencies>
                         <ignoredNonTestScopedDependency>build.codemodel:codemodel-foundation</ignoredNonTestScopedDependency>
-                        <ignoredNonTestScopedDependency>build.codemodel:jdk-codemodel</ignoredNonTestScopedDependency>
+                        <ignoredNonTestScopedDependency>build.codemodel:codemodel-jdk</ignoredNonTestScopedDependency>
                     </ignoredNonTestScopedDependencies>
                 </configuration>
             </plugin>
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/AbstractSession.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/AbstractSession.java
index 6617c78..8ba3b7d 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/AbstractSession.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/AbstractSession.java
@@ -29,9 +29,9 @@
 import build.base.option.Email;
 import build.base.option.Password;
 import build.base.option.Username;
-import build.codemodel.injection.ConfigurationResolver;
-import build.codemodel.injection.Context;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.ConfigurationResolver;
+import build.codemodel.dependency.injection.Context;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.spawn.docker.Event;
 import build.spawn.docker.Image;
 import build.spawn.docker.Images;
@@ -112,7 +112,7 @@ public class AbstractSession
     /**
      * Constructs an {@link AbstractSession} using the specified {@link HttpTransport} and {@link Configuration}.
      *
-     * @param injectionFramework the {@link InjectionFramework} to use for {@link build.codemodel.injection.Dependency} injection
+     * @param injectionFramework the {@link InjectionFramework} to use for {@link build.codemodel.dependency.injection.Dependency} injection
      * @param transport          the {@link HttpTransport} for communicating with the Docker Engine
      * @param configuration      the {@link Configuration}
      */
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/DockerHostVariableBasedSessionFactory.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/DockerHostVariableBasedSessionFactory.java
index 614f521..1f9502f 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/DockerHostVariableBasedSessionFactory.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/DockerHostVariableBasedSessionFactory.java
@@ -21,7 +21,7 @@
  */
 
 import build.base.configuration.Configuration;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.spawn.docker.Session;
 import jakarta.inject.Inject;
 
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/InternalDockerHostBasedSessionFactory.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/InternalDockerHostBasedSessionFactory.java
index 53a822f..0a9d7c6 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/InternalDockerHostBasedSessionFactory.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/InternalDockerHostBasedSessionFactory.java
@@ -21,7 +21,7 @@
  */
 
 import build.base.configuration.Configuration;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.spawn.docker.Session;
 import jakarta.inject.Inject;
 
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/LocalHostBasedSessionFactory.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/LocalHostBasedSessionFactory.java
index 9dec51f..514a015 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/LocalHostBasedSessionFactory.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/LocalHostBasedSessionFactory.java
@@ -21,7 +21,7 @@
  */
 
 import build.base.configuration.Configuration;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.spawn.docker.Session;
 import jakarta.inject.Inject;
 
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/TCPSocketBasedSession.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/TCPSocketBasedSession.java
index 110e278..a1f8b16 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/TCPSocketBasedSession.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/TCPSocketBasedSession.java
@@ -21,7 +21,7 @@
  */
 
 import build.base.configuration.Configuration;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.InjectionFramework;
 
 import java.net.InetSocketAddress;
 import java.net.http.HttpClient;
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/UnixDomainSocketBasedSession.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/UnixDomainSocketBasedSession.java
index 6acdc3e..125d49c 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/UnixDomainSocketBasedSession.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/UnixDomainSocketBasedSession.java
@@ -21,7 +21,7 @@
  */
 
 import build.base.configuration.Configuration;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.spawn.docker.Session;
 import jakarta.inject.Inject;
 
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/AbstractCommand.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/AbstractCommand.java
index fc7958f..3db346b 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/AbstractCommand.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/AbstractCommand.java
@@ -20,7 +20,7 @@
  * #L%
  */
 
-import build.codemodel.injection.Context;
+import build.codemodel.dependency.injection.Context;
 import build.spawn.docker.jdk.HttpTransport;
 import jakarta.inject.Inject;
 
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/CreateContainer.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/CreateContainer.java
index c4f87fc..e9b5c3f 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/CreateContainer.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/CreateContainer.java
@@ -27,7 +27,7 @@
 import build.base.json.JsonValue;
 import build.base.naming.UniqueNameGenerator;
 import build.base.option.HostName;
-import build.codemodel.injection.Context;
+import build.codemodel.dependency.injection.Context;
 import build.spawn.docker.Container;
 import build.spawn.docker.Image;
 import build.spawn.docker.jdk.HttpTransport;
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/InspectContainer.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/InspectContainer.java
index c0366fd..5192e5d 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/InspectContainer.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/command/InspectContainer.java
@@ -22,7 +22,7 @@
 
 import build.base.json.Json;
 import build.base.json.JsonValue;
-import build.codemodel.injection.Context;
+import build.codemodel.dependency.injection.Context;
 import build.spawn.docker.Container;
 import build.spawn.docker.jdk.HttpTransport;
 
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/model/DockerContainer.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/model/DockerContainer.java
index 5ac119e..4ddc03f 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/model/DockerContainer.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/model/DockerContainer.java
@@ -30,8 +30,8 @@
 import build.base.io.Terminal;
 import build.base.json.JsonNumber;
 import build.base.json.JsonString;
-import build.codemodel.injection.Context;
-import build.codemodel.injection.PostInject;
+import build.codemodel.dependency.injection.Context;
+import build.codemodel.dependency.injection.PostInject;
 import build.spawn.docker.Container;
 import build.spawn.docker.Event;
 import build.spawn.docker.Executable;
diff --git a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/model/DockerImage.java b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/model/DockerImage.java
index 3eb1548..77ff50e 100644
--- a/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/model/DockerImage.java
+++ b/spawn-docker-jdk/src/main/java/build/spawn/docker/jdk/model/DockerImage.java
@@ -22,7 +22,7 @@
 
 import build.base.configuration.Configuration;
 import build.base.json.JsonString;
-import build.codemodel.injection.Context;
+import build.codemodel.dependency.injection.Context;
 import build.spawn.docker.Container;
 import build.spawn.docker.Image;
 import build.spawn.docker.jdk.command.CreateContainer;
diff --git a/spawn-docker-jdk/src/main/java/module-info.java b/spawn-docker-jdk/src/main/java/module-info.java
index a5b48bd..bcc4472 100644
--- a/spawn-docker-jdk/src/main/java/module-info.java
+++ b/spawn-docker-jdk/src/main/java/module-info.java
@@ -29,7 +29,7 @@
 
     requires build.codemodel.foundation;
     requires build.codemodel.jdk;
-    requires build.codemodel.injection;
+    requires build.codemodel.dependency.injection;
 
     requires transitive build.base.naming;
 
diff --git a/spawn-docker-jdk/src/test/java/build/spawn/docker/jdk/SessionTests.java b/spawn-docker-jdk/src/test/java/build/spawn/docker/jdk/SessionTests.java
index ff43654..7f4ec06 100644
--- a/spawn-docker-jdk/src/test/java/build/spawn/docker/jdk/SessionTests.java
+++ b/spawn-docker-jdk/src/test/java/build/spawn/docker/jdk/SessionTests.java
@@ -6,7 +6,7 @@
 import build.base.configuration.Option;
 import build.base.naming.UniqueNameGenerator;
 import build.codemodel.foundation.naming.NonCachingNameProvider;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.InjectionFramework;
 import build.codemodel.jdk.JDKCodeModel;
 import build.spawn.docker.Container;
 import build.spawn.docker.DockerContextBuilder;
diff --git a/spawn-docker/pom.xml b/spawn-docker/pom.xml
index d9648d7..bf12d6d 100644
--- a/spawn-docker/pom.xml
+++ b/spawn-docker/pom.xml
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>build.codemodel</groupId>
-            <artifactId>dependency-injection</artifactId>
+            <artifactId>codemodel-dependency-injection</artifactId>
         </dependency>
 
         <!-- Test Dependencies -->
diff --git a/spawn-docker/src/main/java/build/spawn/docker/Sessions.java b/spawn-docker/src/main/java/build/spawn/docker/Sessions.java
index fff17b1..106f2fd 100644
--- a/spawn-docker/src/main/java/build/spawn/docker/Sessions.java
+++ b/spawn-docker/src/main/java/build/spawn/docker/Sessions.java
@@ -22,7 +22,7 @@
 
 import build.base.configuration.Configuration;
 import build.base.configuration.Option;
-import build.codemodel.injection.InjectionFramework;
+import build.codemodel.dependency.injection.InjectionFramework;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/spawn-docker/src/main/java/module-info.java b/spawn-docker/src/main/java/module-info.java
index 45b2952..0197246 100644
--- a/spawn-docker/src/main/java/module-info.java
+++ b/spawn-docker/src/main/java/module-info.java
@@ -30,7 +30,7 @@
     requires build.base.io;
     requires build.base.flow;
 
-    requires transitive build.codemodel.injection;
+    requires transitive build.codemodel.dependency.injection;
 
     exports build.spawn.docker;
     exports build.spawn.docker.option;