diff --git a/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPlugin.java b/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPlugin.java
index 6968131..f0aa2d5 100644
--- a/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPlugin.java
+++ b/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPlugin.java
@@ -86,7 +86,7 @@ public void apply(Project project) {
     }
 
     private void configureModuleDescriptorTasks(Project project) {
-        project.getExtensions().getByType(SourceSetContainer.class).all(sourceSet -> {
+        project.getExtensions().getByType(SourceSetContainer.class).configureEach(sourceSet -> {
             String name = sourceSet.getTaskName("", "moduleDescriptorRecommendations");
             project.getTasks().register(name, ModuleDescriptorRecommendation.class, task -> {
                 Transformer<List<File>, Configuration> artifactsTransformer = configuration -> {
@@ -148,12 +148,12 @@ private void configureTransform(Project project, ExtraJavaModuleInfoPluginExtens
             // Automatically get versions from the runtime classpath
             if (GradleVersion.current().compareTo(GradleVersion.version("6.8")) >= 0) {
                 //noinspection UnstableApiUsage
-                c.shouldResolveConsistentlyWith(project.getConfigurations().getByName(RUNTIME_CLASSPATH_CONFIGURATION_NAME));
+                c.shouldResolveConsistentlyWith(project.getConfigurations().named(RUNTIME_CLASSPATH_CONFIGURATION_NAME).get());
             }
         });
 
         // If 'internal' is added by 'org.gradlex.jvm-dependency-conflict-resolution', extend from it to get access to versions
-        project.getConfigurations().all(otherConfiguration -> {
+        project.getConfigurations().configureEach(otherConfiguration -> {
             if ("internal".equals(otherConfiguration.getName())) {
                 javaModulesMergeJars.extendsFrom(otherConfiguration);
             }
@@ -161,7 +161,7 @@ private void configureTransform(Project project, ExtraJavaModuleInfoPluginExtens
 
         Attribute<String> artifactType = Attribute.of("artifactType", String.class);
 
-        project.getExtensions().getByType(SourceSetContainer.class).all(sourceSet -> {
+        project.getExtensions().getByType(SourceSetContainer.class).configureEach(sourceSet -> {
             // by default, activate plugin for all source sets
             extension.activate(sourceSet);
 
diff --git a/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPluginExtension.java b/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPluginExtension.java
index bda1d55..c850712 100644
--- a/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPluginExtension.java
+++ b/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPluginExtension.java
@@ -81,7 +81,7 @@ public void module(Provider<MinimalExternalModuleDependency> alias, String modul
      * @param moduleName the Module Name of the Module to construct
      * @param moduleVersion version to write into the module-info.class
      */
-    public void module(String identifier, String moduleName, String moduleVersion) {
+    public void module(String identifier, String moduleName, @Nullable String moduleVersion) {
         module(identifier, moduleName, moduleVersion, m -> {
             m.exportAllPackages();
             if (identifier.contains(":")) { // only if the identifier is a coordinates (not a Jar)
@@ -97,7 +97,7 @@ public void module(String identifier, String moduleName, String moduleVersion) {
      * @param moduleName the Module Name of the Module to construct
      * @param moduleVersion version to write into the module-info.class
      */
-    public void module(Provider<MinimalExternalModuleDependency> alias, String moduleName, String moduleVersion) {
+    public void module(Provider<MinimalExternalModuleDependency> alias, String moduleName, @Nullable String moduleVersion) {
         module(alias.get().getModule().toString(), moduleName, moduleVersion);
     }
 
@@ -230,9 +230,12 @@ public void knownModule(Provider<MinimalExternalModuleDependency> alias, String
      * @param sourceSet the Source Set to activate (e.g. sourceSets.test)
      */
     public void activate(SourceSet sourceSet) {
-        Configuration runtimeClasspath = getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName());
-        Configuration compileClasspath = getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName());
-        Configuration annotationProcessor = getConfigurations().getByName(sourceSet.getAnnotationProcessorConfigurationName());
+        NamedDomainObjectProvider<Configuration> runtimeClasspath =
+                getConfigurations().named(sourceSet.getRuntimeClasspathConfigurationName());
+        NamedDomainObjectProvider<Configuration> compileClasspath =
+                getConfigurations().named(sourceSet.getCompileClasspathConfigurationName());
+        NamedDomainObjectProvider<Configuration> annotationProcessor =
+                getConfigurations().named(sourceSet.getAnnotationProcessorConfigurationName());
 
         activate(runtimeClasspath);
         activate(compileClasspath);
@@ -275,9 +278,12 @@ public void activate(NamedDomainObjectProvider<?> sourceSetOrResolvable) {
      * @param sourceSet the Source Set to deactivate (e.g. sourceSets.test)
      */
     public void deactivate(SourceSet sourceSet) {
-        Configuration runtimeClasspath = getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName());
-        Configuration compileClasspath = getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName());
-        Configuration annotationProcessor = getConfigurations().getByName(sourceSet.getAnnotationProcessorConfigurationName());
+        NamedDomainObjectProvider<Configuration> runtimeClasspath =
+                getConfigurations().named(sourceSet.getRuntimeClasspathConfigurationName());
+        NamedDomainObjectProvider<Configuration> compileClasspath =
+                getConfigurations().named(sourceSet.getCompileClasspathConfigurationName());
+        NamedDomainObjectProvider<Configuration> annotationProcessor =
+                getConfigurations().named(sourceSet.getAnnotationProcessorConfigurationName());
 
         deactivate(runtimeClasspath);
         deactivate(compileClasspath);
diff --git a/src/main/java/org/gradlex/javamodule/moduleinfo/PublishedMetadata.java b/src/main/java/org/gradlex/javamodule/moduleinfo/PublishedMetadata.java
index 88beb41..b6ae43a 100644
--- a/src/main/java/org/gradlex/javamodule/moduleinfo/PublishedMetadata.java
+++ b/src/main/java/org/gradlex/javamodule/moduleinfo/PublishedMetadata.java
@@ -78,7 +78,7 @@ public class PublishedMetadata implements Serializable {
     private List<String> componentVariant(Provider<String> versionsProvidingConfiguration, Project project, String usage) {
         Configuration versionsSource;
         if (versionsProvidingConfiguration.isPresent()) {
-            versionsSource = project.getConfigurations().getByName(versionsProvidingConfiguration.get());
+            versionsSource = project.getConfigurations().named(versionsProvidingConfiguration.get()).get();
         } else {
             // version provider is not configured, create on adhoc based on ALL classpaths of the project
             versionsSource = maybeCreateDefaultVersionSourcConfiguration(project.getConfigurations(), project.getObjects(),
@@ -118,10 +118,10 @@ private Configuration maybeCreateDefaultVersionSourcConfiguration(ConfigurationC
 
             if (sourceSets != null) {
                 for (SourceSet sourceSet : sourceSets) {
-                    Configuration implementation = configurations.getByName(sourceSet.getImplementationConfigurationName());
-                    Configuration compileOnly = configurations.getByName(sourceSet.getCompileOnlyConfigurationName());
-                    Configuration runtimeOnly = configurations.getByName(sourceSet.getRuntimeOnlyConfigurationName());
-                    Configuration annotationProcessor = configurations.getByName(sourceSet.getAnnotationProcessorConfigurationName());
+                    Configuration implementation = configurations.named(sourceSet.getImplementationConfigurationName()).get();
+                    Configuration compileOnly = configurations.named(sourceSet.getCompileOnlyConfigurationName()).get();
+                    Configuration runtimeOnly = configurations.named(sourceSet.getRuntimeOnlyConfigurationName()).get();
+                    Configuration annotationProcessor = configurations.named(sourceSet.getAnnotationProcessorConfigurationName()).get();
                     c.extendsFrom(implementation, compileOnly, runtimeOnly, annotationProcessor);
                 }
             }