diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterface.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterface.java
index 36942267..b6ee45a7 100644
--- a/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterface.java
+++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterface.java
@@ -53,7 +53,7 @@ public class NamedInterface implements Iterable<JavaClass> {
 	}
 
 	/**
-	 * Returns all {@link PackageBasedNamedInterface}s for the given {@link JavaPackage}.
+	 * Returns all {@link NamedInterface}s for the given {@link JavaPackage}.
 	 *
 	 * @param javaPackage must not be {@literal null}.
 	 * @return will never be {@literal null}.
@@ -73,11 +73,10 @@ public class NamedInterface implements Iterable<JavaClass> {
 	}
 
 	/**
-	 * Returns a {@link TypeBasedNamedInterface} with the given name, {@link Classes} and base {@link JavaPackage}.
+	 * Returns a {@link NamedInterface} with the given name, {@link Classes} and base {@link JavaPackage}.
 	 *
 	 * @param name must not be {@literal null} or empty.
 	 * @param classes must not be {@literal null}.
-	 * @param basePackage must not be {@literal null}.
 	 * @return will never be {@literal null}.
 	 */
 	static NamedInterface of(String name, Classes classes) {
@@ -156,7 +155,7 @@ public class NamedInterface implements Iterable<JavaClass> {
 	}
 
 	/**
-	 * Merges the current {@link NamedInterface} with the given {@link TypeBasedNamedInterface}.
+	 * Merges the current {@link NamedInterface} with the given {@link NamedInterface}.
 	 *
 	 * @param other must not be {@literal null}.
 	 * @return will never be {@literal null}.
diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterfaces.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterfaces.java
index da374037..c40182e7 100644
--- a/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterfaces.java
+++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterfaces.java
@@ -145,14 +145,14 @@ public class NamedInterfaces implements Iterable<NamedInterface> {
 	}
 
 	/**
-	 * Creates a new {@link NamedInterfaces} instance with the given {@link TypeBasedNamedInterface}s added.
+	 * Creates a new {@link NamedInterfaces} instance with the given {@link NamedInterface}s added.
 	 *
 	 * @param others must not be {@literal null}.
 	 * @return will never be {@literal null}.
 	 */
 	NamedInterfaces and(List<NamedInterface> others) {
 
-		Assert.notNull(others, "Other TypeBasedNamedInterfaces must not be null!");
+		Assert.notNull(others, "Other NamedInterfaces must not be null!");
 
 		var namedInterfaces = new ArrayList<NamedInterface>();
 		var unmergedInterface = this.namedInterfaces;