diff --git a/modulecheck-finding/api/src/main/kotlin/modulecheck/finding/Suppressions.kt b/modulecheck-finding/api/src/main/kotlin/modulecheck/finding/Suppressions.kt
index 761e0d7eb1..bf62e0741e 100644
--- a/modulecheck-finding/api/src/main/kotlin/modulecheck/finding/Suppressions.kt
+++ b/modulecheck-finding/api/src/main/kotlin/modulecheck/finding/Suppressions.kt
@@ -16,7 +16,6 @@
 package modulecheck.finding
 
 import modulecheck.parsing.gradle.dsl.HasBuildFile
-import modulecheck.parsing.gradle.model.ConfiguredProjectDependency
 import modulecheck.parsing.gradle.model.Dependency
 import modulecheck.parsing.gradle.model.PluginDependency
 import modulecheck.project.HasProjectCache
@@ -54,13 +53,7 @@ suspend fun <T> T.getSuppressions(): Suppressions
     .map { it.allSuppressions }
     .fold(mutableMapOf<Dependency, MutableSet<FindingName>>()) { acc, block ->
 
-      block.forEach { (configuredModule, newNames) ->
-
-        val cpd = ConfiguredProjectDependency(
-          configuredModule.configName,
-          configuredModule.projectPath,
-          configuredModule.testFixtures
-        )
+      block.forEach { (cpd, newNames) ->
 
         val cachedNames = acc.getOrPut(cpd) { mutableSetOf() }
 
diff --git a/modulecheck-parsing/gradle/dsl/api/src/main/kotlin/modulecheck/parsing/gradle/dsl/DependenciesBlock.kt b/modulecheck-parsing/gradle/dsl/api/src/main/kotlin/modulecheck/parsing/gradle/dsl/DependenciesBlock.kt
index d6bf017bec..4199d9d4ed 100644
--- a/modulecheck-parsing/gradle/dsl/api/src/main/kotlin/modulecheck/parsing/gradle/dsl/DependenciesBlock.kt
+++ b/modulecheck-parsing/gradle/dsl/api/src/main/kotlin/modulecheck/parsing/gradle/dsl/DependenciesBlock.kt
@@ -16,14 +16,14 @@
 package modulecheck.parsing.gradle.dsl
 
 import modulecheck.finding.FindingName
-import modulecheck.parsing.gradle.dsl.DependenciesBlock.ConfiguredModule
 import modulecheck.parsing.gradle.model.ConfigurationName
+import modulecheck.parsing.gradle.model.ConfiguredProjectDependency
 import modulecheck.parsing.gradle.model.MavenCoordinates
 import modulecheck.parsing.gradle.model.ProjectPath
 
 interface DependenciesBlock :
   Block<DependencyDeclaration>,
-  HasSuppressedChildren<ConfiguredModule, FindingName> {
+  HasSuppressedChildren<ConfiguredProjectDependency, FindingName> {
 
   fun getOrEmpty(
     moduleRef: String,
@@ -41,12 +41,6 @@ interface DependenciesBlock :
     mavenCoordinates: MavenCoordinates,
     configName: ConfigurationName
   ): List<ExternalDependencyDeclaration>
-
-  data class ConfiguredModule(
-    val configName: ConfigurationName,
-    val projectPath: ProjectPath,
-    val testFixtures: Boolean
-  )
 }
 
 interface DependenciesBlocksProvider {
diff --git a/modulecheck-parsing/gradle/dsl/internal/src/main/kotlin/modulecheck/parsing/gradle/dsl/internal/AbstractDependenciesBlock.kt b/modulecheck-parsing/gradle/dsl/internal/src/main/kotlin/modulecheck/parsing/gradle/dsl/internal/AbstractDependenciesBlock.kt
index 928bd41067..ad34f14fea 100644
--- a/modulecheck-parsing/gradle/dsl/internal/src/main/kotlin/modulecheck/parsing/gradle/dsl/internal/AbstractDependenciesBlock.kt
+++ b/modulecheck-parsing/gradle/dsl/internal/src/main/kotlin/modulecheck/parsing/gradle/dsl/internal/AbstractDependenciesBlock.kt
@@ -18,7 +18,6 @@ package modulecheck.parsing.gradle.dsl.internal
 import modulecheck.finding.FindingName
 import modulecheck.finding.FindingName.Companion.migrateLegacyIdOrNull
 import modulecheck.parsing.gradle.dsl.DependenciesBlock
-import modulecheck.parsing.gradle.dsl.DependenciesBlock.ConfiguredModule
 import modulecheck.parsing.gradle.dsl.DependencyDeclaration
 import modulecheck.parsing.gradle.dsl.DependencyDeclaration.ConfigurationNameTransform
 import modulecheck.parsing.gradle.dsl.ExternalDependencyDeclaration
@@ -27,6 +26,7 @@ import modulecheck.parsing.gradle.dsl.ModuleDependencyDeclaration
 import modulecheck.parsing.gradle.dsl.ProjectAccessor
 import modulecheck.parsing.gradle.dsl.UnknownDependencyDeclaration
 import modulecheck.parsing.gradle.model.ConfigurationName
+import modulecheck.parsing.gradle.model.ConfiguredProjectDependency
 import modulecheck.parsing.gradle.model.MavenCoordinates
 import modulecheck.parsing.gradle.model.ProjectPath
 import modulecheck.parsing.gradle.model.ProjectPath.StringProjectPath
@@ -46,8 +46,8 @@ abstract class AbstractDependenciesBlock(
 
   val suppressedForEntireBlock = suppressedForEntireBlock.updateOldSuppresses()
 
-  override val allSuppressions: Map<ConfiguredModule, Set<FindingName>> by resetManager.lazyResets {
-    buildMap<ConfiguredModule, MutableSet<FindingName>> {
+  override val allSuppressions: Map<ConfiguredProjectDependency, Set<FindingName>> by resetManager.lazyResets {
+    buildMap<ConfiguredProjectDependency, MutableSet<FindingName>> {
 
       allModuleDeclarations.forEach { (configuredModule, declarations) ->
 
@@ -76,7 +76,7 @@ abstract class AbstractDependenciesBlock(
     mutableMapOf<MavenCoordinates, MutableList<ExternalDependencyDeclaration>>()
 
   private val allModuleDeclarations =
-    mutableMapOf<ConfiguredModule, MutableList<ModuleDependencyDeclaration>>()
+    mutableMapOf<ConfiguredProjectDependency, MutableList<ModuleDependencyDeclaration>>()
 
   fun addNonModuleStatement(
     configName: ConfigurationName,
@@ -134,10 +134,10 @@ abstract class AbstractDependenciesBlock(
 
     val isTestFixtures = parsedString.contains(testFixturesRegex)
 
-    val cm = ConfiguredModule(
-      configName = configName,
-      projectPath = projectPath,
-      testFixtures = isTestFixtures
+    val cpd = ConfiguredProjectDependency(
+      configurationName = configName,
+      path = projectPath,
+      isTestFixture = isTestFixtures
     )
 
     val originalString = getOriginalString(parsedString)
@@ -152,7 +152,7 @@ abstract class AbstractDependenciesBlock(
       configurationNameTransform = configurationNameTransform
     )
 
-    allModuleDeclarations.getOrPut(cm) { mutableListOf() }
+    allModuleDeclarations.getOrPut(cpd) { mutableListOf() }
       .add(declaration)
 
     _allDeclarations.add(declaration)
@@ -185,9 +185,13 @@ abstract class AbstractDependenciesBlock(
     testFixtures: Boolean
   ): List<ModuleDependencyDeclaration> {
 
-    return allModuleDeclarations[ConfiguredModule(configName, moduleRef, testFixtures)]
-      ?: allModuleDeclarations[ConfiguredModule(configName, moduleRef.toTypeSafe(), testFixtures)]
-      ?: emptyList()
+    return allModuleDeclarations[
+      ConfiguredProjectDependency(
+        configurationName = configName,
+        path = moduleRef,
+        isTestFixture = testFixtures
+      )
+    ].orEmpty()
   }
 
   override fun getOrEmpty(