diff --git a/cli/src/funTest/kotlin/OrtMainFunTest.kt b/cli/src/funTest/kotlin/OrtMainFunTest.kt
index 5f4fe1e7e16e8..127267032c624 100644
--- a/cli/src/funTest/kotlin/OrtMainFunTest.kt
+++ b/cli/src/funTest/kotlin/OrtMainFunTest.kt
@@ -161,7 +161,7 @@ class OrtMainFunTest : StringSpec() {
 
             ortResult.analyzer shouldNotBeNull {
                 result.projects should haveSize(1)
-                result.projects.single().id.type shouldBe "Unmanaged"
+                result.projects.single().id.type shouldBe "UnmanagedProject"
             }
         }
 
diff --git a/model/src/test/assets/gradle-all-dependencies-expected-result.yml b/model/src/test/assets/gradle-all-dependencies-expected-result.yml
index 5812c291755e4..7e00ae1957b68 100644
--- a/model/src/test/assets/gradle-all-dependencies-expected-result.yml
+++ b/model/src/test/assets/gradle-all-dependencies-expected-result.yml
@@ -52,7 +52,7 @@ analyzer:
     - "Gradle"
   result:
     projects:
-    - id: "Gradle::Gradle-Example:"
+    - id: "GradleProject::Gradle-Example:"
       definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/build.gradle"
       declared_licenses: []
       declared_licenses_processed: {}
@@ -68,7 +68,7 @@ analyzer:
         path: "analyzer/src/funTest/assets/projects/synthetic/gradle"
       homepage_url: ""
       scopes: []
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
       definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
       declared_licenses: []
       declared_licenses_processed: {}
@@ -86,11 +86,11 @@ analyzer:
       scopes:
       - name: "compileClasspath"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
       - name: "runtimeClasspath"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -99,18 +99,18 @@ analyzer:
           - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
       - name: "testCompileClasspath"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
       - name: "testRuntimeClasspath"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
             dependencies:
             - id: "Maven:org.apache.commons:commons-lang3:3.5"
           - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle"
       declared_licenses: []
       declared_licenses_processed: {}
@@ -156,7 +156,7 @@ analyzer:
           dependencies:
           - id: "Maven:org.apache.commons:commons-lang3:3.5"
         - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
       definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle"
       declared_licenses: []
       declared_licenses_processed: {}
diff --git a/model/src/test/assets/maven-expected-output-app.yml b/model/src/test/assets/maven-expected-output-app.yml
index 5d3a9c8f41d63..49792d715e862 100644
--- a/model/src/test/assets/maven-expected-output-app.yml
+++ b/model/src/test/assets/maven-expected-output-app.yml
@@ -25,7 +25,7 @@ project:
   scopes:
   - name: "compile"
     dependencies:
-    - id: "Maven:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
+    - id: "MavenProject:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.beam:beam-parent:2.3.0"
diff --git a/model/src/test/assets/result-with-issues-graph-old.yml b/model/src/test/assets/result-with-issues-graph-old.yml
index 813f1a184b827..5d80e8ecbe4ce 100644
--- a/model/src/test/assets/result-with-issues-graph-old.yml
+++ b/model/src/test/assets/result-with-issues-graph-old.yml
@@ -27,7 +27,7 @@ analyzer:
     allow_dynamic_versions: false
   result:
     projects:
-    - id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
       definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
       definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
       definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
       definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
         - "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
         - "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
         - "Maven:org.typelevel:macro-compat_2.12:1.1.1"
-        - "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
+        - "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
         - "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
         - "Maven:com.chuusai:shapeless_2.12:2.3.2"
         - "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"
diff --git a/model/src/test/assets/result-with-issues-graph.yml b/model/src/test/assets/result-with-issues-graph.yml
index 383a2a8ba0cad..8e24549e67a56 100644
--- a/model/src/test/assets/result-with-issues-graph.yml
+++ b/model/src/test/assets/result-with-issues-graph.yml
@@ -27,7 +27,7 @@ analyzer:
     allow_dynamic_versions: false
   result:
     projects:
-    - id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
       definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
       definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
       definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
       definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
         - "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
         - "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
         - "Maven:org.typelevel:macro-compat_2.12:1.1.1"
-        - "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
+        - "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
         - "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
         - "Maven:com.chuusai:shapeless_2.12:2.3.2"
         - "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"
diff --git a/model/src/test/assets/result-with-issues-scopes.yml b/model/src/test/assets/result-with-issues-scopes.yml
index e48882fd41e74..82b7737c63d76 100644
--- a/model/src/test/assets/result-with-issues-scopes.yml
+++ b/model/src/test/assets/result-with-issues-scopes.yml
@@ -27,7 +27,7 @@ analyzer:
     allow_dynamic_versions: false
   result:
     projects:
-    - id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
       definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -90,7 +90,7 @@ analyzer:
               source: "Gradle"
               message: "Test issue 2"
               severity: "ERROR"
-    - id: "SBT:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi1_2.12:0.1-SNAPSHOT"
       definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -139,7 +139,7 @@ analyzer:
             - id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
         - id: "Maven:org.scala-lang:scala-library:2.12.3"
         - id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
-        - id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
+        - id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
           linkage: "PROJECT_DYNAMIC"
       - name: "test"
         dependencies:
@@ -151,7 +151,7 @@ analyzer:
           - id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
           - id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
           - id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
-    - id: "SBT:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi2_2.12:0.1-SNAPSHOT"
       definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -201,7 +201,7 @@ analyzer:
             - id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
         - id: "Maven:org.scala-lang:scala-library:2.12.3"
         - id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
-        - id: "SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT"
+        - id: "SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT"
           linkage: "PROJECT_DYNAMIC"
       - name: "test"
         dependencies:
@@ -213,7 +213,7 @@ analyzer:
           - id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
           - id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
           - id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
-    - id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
       definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
diff --git a/model/src/test/assets/sbt-multi-project-example-expected-output.yml b/model/src/test/assets/sbt-multi-project-example-expected-output.yml
index 61689dfc575bd..1f71f6ef2ea62 100644
--- a/model/src/test/assets/sbt-multi-project-example-expected-output.yml
+++ b/model/src/test/assets/sbt-multi-project-example-expected-output.yml
@@ -28,7 +28,7 @@ analyzer:
     skip_excluded: false
   result:
     projects:
-    - id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "common/target-scala-2.12-common_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -81,7 +81,7 @@ analyzer:
           - id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
           - id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
           - id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
-    - id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -130,7 +130,7 @@ analyzer:
             - id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
         - id: "Maven:org.scala-lang:scala-library:2.12.15"
         - id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
-        - id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+        - id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
           linkage: "PROJECT_DYNAMIC"
       - name: "test"
         dependencies:
@@ -142,7 +142,7 @@ analyzer:
           - id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
           - id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
           - id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
-    - id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -192,7 +192,7 @@ analyzer:
             - id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
         - id: "Maven:org.scala-lang:scala-library:2.12.15"
         - id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
-        - id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+        - id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
           linkage: "PROJECT_DYNAMIC"
       - name: "test"
         dependencies:
@@ -204,7 +204,7 @@ analyzer:
           - id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
           - id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
           - id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
-    - id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
diff --git a/model/src/test/assets/sbt-multi-project-example-graph-old.yml b/model/src/test/assets/sbt-multi-project-example-graph-old.yml
index 75faa6da133a5..9489c4efde001 100644
--- a/model/src/test/assets/sbt-multi-project-example-graph-old.yml
+++ b/model/src/test/assets/sbt-multi-project-example-graph-old.yml
@@ -27,7 +27,7 @@ analyzer:
     allow_dynamic_versions: false
   result:
     projects:
-    - id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "common/target-scala-2.12-common_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
       definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
         - "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
         - "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
         - "Maven:org.typelevel:macro-compat_2.12:1.1.1"
-        - "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+        - "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
         - "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
         - "Maven:com.chuusai:shapeless_2.12:2.3.2"
         - "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"
diff --git a/model/src/test/assets/sbt-multi-project-example-graph.yml b/model/src/test/assets/sbt-multi-project-example-graph.yml
index 53969a4d0d20d..9860dc40df220 100644
--- a/model/src/test/assets/sbt-multi-project-example-graph.yml
+++ b/model/src/test/assets/sbt-multi-project-example-graph.yml
@@ -27,7 +27,7 @@ analyzer:
     allow_dynamic_versions: false
   result:
     projects:
-    - id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "common/target-scala-2.12-common_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -47,7 +47,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -67,7 +67,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -87,7 +87,7 @@ analyzer:
       scope_names:
       - "compile"
       - "test"
-    - id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1-SNAPSHOT"
       definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -1205,7 +1205,7 @@ analyzer:
         - "Maven:org.scalaz:scalaz-core_2.12:7.2.8"
         - "Maven:com.github.julien-truffaut:monocle-macro_2.12:1.4.0"
         - "Maven:org.typelevel:macro-compat_2.12:1.1.1"
-        - "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+        - "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
         - "Maven:com.github.pureconfig:pureconfig_2.12:0.8.0"
         - "Maven:com.chuusai:shapeless_2.12:2.3.2"
         - "Maven:com.github.pureconfig:pureconfig-macros_2.12:0.8.0"
diff --git a/model/src/test/kotlin/AbstractDependencyNavigatorTest.kt b/model/src/test/kotlin/AbstractDependencyNavigatorTest.kt
index 1df47ff6d3f70..a9142bb7c227e 100644
--- a/model/src/test/kotlin/AbstractDependencyNavigatorTest.kt
+++ b/model/src/test/kotlin/AbstractDependencyNavigatorTest.kt
@@ -248,7 +248,7 @@ abstract class AbstractDependencyNavigatorTest : WordSpec() {
             }
 
             "find all the sub-projects of a project" {
-                val projectId = Identifier("SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT")
+                val projectId = Identifier("SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT")
                 testResult.getProject(projectId) shouldNotBeNull {
                     val subProjectIds = navigator.projectDependencies(this, matcher = MATCH_SUB_PROJECTS)
 
@@ -325,7 +325,7 @@ abstract class AbstractDependencyNavigatorTest : WordSpec() {
             "return the issues of a project" {
                 val ortResultWithIssues = File(resultWithIssuesFileName).readValue<OrtResult>()
                 val navigator = ortResultWithIssues.dependencyNavigator
-                val projectIdWithIssues = Identifier("SBT:com.pbassiner:common_2.12:0.1-SNAPSHOT")
+                val projectIdWithIssues = Identifier("SBTProject:com.pbassiner:common_2.12:0.1-SNAPSHOT")
                 val project = ortResultWithIssues.getProject(projectIdWithIssues)
 
                 project shouldNotBeNull {
@@ -386,4 +386,4 @@ abstract class AbstractDependencyNavigatorTest : WordSpec() {
 }
 
 /** Identifier of the project used by the tests. */
-private val PROJECT_ID = Identifier("SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT")
+private val PROJECT_ID = Identifier("SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT")
diff --git a/model/src/test/kotlin/OrtResultTest.kt b/model/src/test/kotlin/OrtResultTest.kt
index 884a2930413a4..2fd634458e5d5 100644
--- a/model/src/test/kotlin/OrtResultTest.kt
+++ b/model/src/test/kotlin/OrtResultTest.kt
@@ -62,7 +62,7 @@ class OrtResultTest : WordSpec({
 
     "getProjectsAndPackages()" should {
         val ortResult = readOrtResult("src/test/assets/gradle-all-dependencies-expected-result.yml")
-        val subProjectId = Identifier("Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0")
+        val subProjectId = Identifier("GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0")
 
         "be able to get all ids including sub-projects" {
             val ids = ortResult.getProjectsAndPackages()
diff --git a/plugins/advisors/vulnerable-code/src/test/assets/ort-analyzer-result.yml b/plugins/advisors/vulnerable-code/src/test/assets/ort-analyzer-result.yml
index 0b916212007b5..d23345497e5fa 100644
--- a/plugins/advisors/vulnerable-code/src/test/assets/ort-analyzer-result.yml
+++ b/plugins/advisors/vulnerable-code/src/test/assets/ort-analyzer-result.yml
@@ -88,7 +88,7 @@ analyzer:
         dependencies: []
       - name: "compile"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -97,7 +97,7 @@ analyzer:
           - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
       - name: "compileClasspath"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -108,7 +108,7 @@ analyzer:
         dependencies: []
       - name: "default"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -117,7 +117,7 @@ analyzer:
           - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
       - name: "runtime"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -126,7 +126,7 @@ analyzer:
           - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
       - name: "runtimeClasspath"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -137,7 +137,7 @@ analyzer:
         dependencies: []
       - name: "testCompile"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -146,7 +146,7 @@ analyzer:
           - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
       - name: "testCompileClasspath"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -157,7 +157,7 @@ analyzer:
         dependencies: []
       - name: "testRuntime"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -166,7 +166,7 @@ analyzer:
           - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
       - name: "testRuntimeClasspath"
         dependencies:
-        - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+        - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2-expected-output.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2-expected-output.yml
index ce03f23905821..42cee3e175fa0 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2-expected-output.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2/MODULE.bazel:"
+  id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-7.2/MODULE.bazel:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-archive-override.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-archive-override.yml
index 5a53269bd7959..5934a6327b885 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-archive-override.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-archive-override.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-archive-override/MODULE.bazel:"
+  id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-archive-override/MODULE.bazel:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-git-repository.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-git-repository.yml
index 7d1d6a348f90c..c3e1c5591e3fe 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-git-repository.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-git-repository.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-git-repository/MODULE.bazel:"
+  id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-git-repository/MODULE.bazel:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-path-override.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-path-override.yml
index 3ac7286ce26c8..3a12657d48275 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-path-override.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-path-override.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-path-override/MODULE.bazel:"
+  id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-path-override/MODULE.bazel:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry-with-local-path.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry-with-local-path.yml
index d2ce8e943c9df..531e51e376d89 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry-with-local-path.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry-with-local-path.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry-with-local-path/MODULE.bazel:"
+  id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry-with-local-path/MODULE.bazel:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry.yml
index 90869aeb001e2..f1b4c3b42c37d 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry/MODULE.bazel:"
+  id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry/MODULE.bazel:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry2.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry2.yml
index ae5af2b1547f2..97bb3d32e15cd 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry2.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-local-registry2.yml
@@ -28,7 +28,7 @@ analyzer:
     skip_excluded: false
   result:
     projects:
-    - id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry2/MODULE.bazel:"
+    - id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-local-registry2/MODULE.bazel:"
       definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
       declared_licenses: []
       declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-no-lock-file.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-no-lock-file.yml
index d65214e06ea8e..19312fd8d1616 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-no-lock-file.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-no-lock-file.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-no-lock-file/MODULE.bazel:"
+  id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-no-lock-file/MODULE.bazel:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output.yml b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output.yml
index 7aa152d3913b9..265e3e292a05f 100644
--- a/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output.yml
+++ b/plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bazel::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel/MODULE.bazel:"
+  id: "BazelProject::plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel/MODULE.bazel:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bazel/src/main/kotlin/Bazel.kt b/plugins/package-managers/bazel/src/main/kotlin/Bazel.kt
index bb3e9b25156a2..30f90fef8d7c0 100644
--- a/plugins/package-managers/bazel/src/main/kotlin/Bazel.kt
+++ b/plugins/package-managers/bazel/src/main/kotlin/Bazel.kt
@@ -107,7 +107,7 @@ class Bazel(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Bazel", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "BazelProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Bazel>("Bazel") {
         override val globsForDefinitionFiles = listOf("MODULE", "MODULE.bazel")
 
diff --git a/plugins/package-managers/bower/src/funTest/assets/projects/synthetic/bower-expected-output.yml b/plugins/package-managers/bower/src/funTest/assets/projects/synthetic/bower-expected-output.yml
index 7161e92b9c631..e1c940b5408f2 100644
--- a/plugins/package-managers/bower/src/funTest/assets/projects/synthetic/bower-expected-output.yml
+++ b/plugins/package-managers/bower/src/funTest/assets/projects/synthetic/bower-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bower::a-test-project:"
+  id: "BowerProject::a-test-project:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "author-abc"
diff --git a/plugins/package-managers/bower/src/main/kotlin/Bower.kt b/plugins/package-managers/bower/src/main/kotlin/Bower.kt
index 1715d94a77948..6fb0701318c59 100644
--- a/plugins/package-managers/bower/src/main/kotlin/Bower.kt
+++ b/plugins/package-managers/bower/src/main/kotlin/Bower.kt
@@ -50,7 +50,7 @@ class Bower(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Bower", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "BowerProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Bower>("Bower") {
         override val globsForDefinitionFiles = listOf("bower.json")
 
diff --git a/plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-gemspec.yml b/plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-gemspec.yml
index d2ea8329ce2a2..714a1300d4c08 100644
--- a/plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-gemspec.yml
+++ b/plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-gemspec.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bundler::test-project:1.0.0"
+  id: "BundlerProject::test-project:1.0.0"
   definition_file_path: "plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/gemspec/Gemfile"
   authors:
   - "Bob Example"
diff --git a/plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-lockfile.yml b/plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-lockfile.yml
index 1a8407faf6fba..1ff9e1e2ae6fc 100644
--- a/plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-lockfile.yml
+++ b/plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/bundler-expected-output-lockfile.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Bundler::src/funTest/assets/projects/synthetic/lockfile/Gemfile:"
+  id: "BundlerProject::src/funTest/assets/projects/synthetic/lockfile/Gemfile:"
   definition_file_path: "plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/lockfile/Gemfile"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/bundler/src/funTest/kotlin/BundlerFunTest.kt b/plugins/package-managers/bundler/src/funTest/kotlin/BundlerFunTest.kt
index 559fc759567da..859d153a49f79 100644
--- a/plugins/package-managers/bundler/src/funTest/kotlin/BundlerFunTest.kt
+++ b/plugins/package-managers/bundler/src/funTest/kotlin/BundlerFunTest.kt
@@ -50,7 +50,7 @@ class BundlerFunTest : WordSpec({
 
             with(actualResult) {
                 project.id shouldBe
-                    Identifier("Bundler::src/funTest/assets/projects/synthetic/no-lockfile/Gemfile:")
+                    Identifier("BundlerProject::src/funTest/assets/projects/synthetic/no-lockfile/Gemfile:")
                 project.definitionFilePath shouldBe
                     "plugins/package-managers/bundler/src/funTest/assets/projects/synthetic/no-lockfile/Gemfile"
                 packages should beEmpty()
diff --git a/plugins/package-managers/bundler/src/main/kotlin/Bundler.kt b/plugins/package-managers/bundler/src/main/kotlin/Bundler.kt
index abee40bd4f62d..b90e1c82a7dd3 100644
--- a/plugins/package-managers/bundler/src/main/kotlin/Bundler.kt
+++ b/plugins/package-managers/bundler/src/main/kotlin/Bundler.kt
@@ -134,7 +134,7 @@ class Bundler(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Bundler", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "BundlerProject", analysisRoot, analyzerConfig, repoConfig) {
     companion object {
         /**
          * The name of the option to specify the Bundler version.
diff --git a/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-expected-output.yml b/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-expected-output.yml
index 2f0d502e9e840..b98e1515ebec1 100644
--- a/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-expected-output.yml
+++ b/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Cargo::lib:0.1.0"
+  id: "CargoProject::lib:0.1.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "Another Author"
diff --git a/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-client-expected-output.yml b/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-client-expected-output.yml
index 7203ff969bb36..d9890eb2829a0 100644
--- a/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-client-expected-output.yml
+++ b/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-client-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Cargo::client:0.1.0"
+  id: "CargoProject::client:0.1.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "anon"
diff --git a/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-integration-expected-output.yml b/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-integration-expected-output.yml
index ace1c67e1b28c..8eab98792f555 100644
--- a/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-integration-expected-output.yml
+++ b/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-integration-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Cargo::integration:0.1.0"
+  id: "CargoProject::integration:0.1.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "anon"
diff --git a/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-lib-expected-output.yml b/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-lib-expected-output.yml
index 9d0f46564f650..8c8a7cb605153 100644
--- a/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-lib-expected-output.yml
+++ b/plugins/package-managers/cargo/src/funTest/assets/projects/synthetic/cargo-subcrate-lib-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Cargo::lib:0.1.0"
+  id: "CargoProject::lib:0.1.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/cargo/src/main/kotlin/Cargo.kt b/plugins/package-managers/cargo/src/main/kotlin/Cargo.kt
index c2e767c22cb17..f47d5f725fdc8 100644
--- a/plugins/package-managers/cargo/src/main/kotlin/Cargo.kt
+++ b/plugins/package-managers/cargo/src/main/kotlin/Cargo.kt
@@ -72,7 +72,7 @@ class Cargo(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Cargo", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "CargoProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Cargo>("Cargo") {
         override val globsForDefinitionFiles = listOf("Cargo.toml")
 
diff --git a/plugins/package-managers/carthage/src/funTest/assets/projects/synthetic/carthage-expected-output.yml b/plugins/package-managers/carthage/src/funTest/assets/projects/synthetic/carthage-expected-output.yml
index d3afb9afd80d9..517036a570760 100644
--- a/plugins/package-managers/carthage/src/funTest/assets/projects/synthetic/carthage-expected-output.yml
+++ b/plugins/package-managers/carthage/src/funTest/assets/projects/synthetic/carthage-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Carthage:<REPLACE_GITHUB_ORGANIZATION>:ort:<REPLACE_REVISION>"
+  id: "CarthageProject:<REPLACE_GITHUB_ORGANIZATION>:ort:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/carthage/src/main/kotlin/Carthage.kt b/plugins/package-managers/carthage/src/main/kotlin/Carthage.kt
index 176902faaddb5..40346f964ff0d 100644
--- a/plugins/package-managers/carthage/src/main/kotlin/Carthage.kt
+++ b/plugins/package-managers/carthage/src/main/kotlin/Carthage.kt
@@ -51,7 +51,7 @@ class Carthage(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Carthage", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "CarthageProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Carthage>("Carthage") {
         // TODO: Add support for the Cartfile.
         //       This would require to resolve the actual dependency versions as a Cartfile supports dynamic versions.
diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml
index 73a5d3057e2be..d39d2efcce28b 100644
--- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml
+++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "CocoaPods::src/funTest/assets/projects/synthetic/dep-tree/Podfile:"
+  id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/dep-tree/Podfile:"
   definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree/Podfile"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml
index 712b26677461b..3d31a3f303297 100644
--- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml
+++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "CocoaPods::src/funTest/assets/projects/synthetic/external-sources/Podfile:"
+  id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/external-sources/Podfile:"
   definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources/Podfile"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/no-lockfile-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/no-lockfile-expected-output.yml
index c6ceb0d78cf2b..13e9df0ace3a7 100644
--- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/no-lockfile-expected-output.yml
+++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/no-lockfile-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "CocoaPods::src/funTest/assets/projects/synthetic/no-lockfile/Podfile:"
+  id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/no-lockfile/Podfile:"
   definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/no-lockfile/Podfile"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml
index fdd7bfbb386f5..e09bb97d7f481 100644
--- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml
+++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "CocoaPods::src/funTest/assets/projects/synthetic/regular/Podfile:"
+  id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/regular/Podfile:"
   definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular/Podfile"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml
index 8f0a214344ab7..92679550269d2 100644
--- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml
+++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "CocoaPods::src/funTest/assets/projects/synthetic/version-resolution/Podfile:"
+  id: "CocoaPodsProject::src/funTest/assets/projects/synthetic/version-resolution/Podfile:"
   definition_file_path: "plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution/Podfile"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/cocoapods/src/main/kotlin/CocoaPods.kt b/plugins/package-managers/cocoapods/src/main/kotlin/CocoaPods.kt
index b43852b814ccf..5de72c1bb34a1 100644
--- a/plugins/package-managers/cocoapods/src/main/kotlin/CocoaPods.kt
+++ b/plugins/package-managers/cocoapods/src/main/kotlin/CocoaPods.kt
@@ -68,7 +68,7 @@ class CocoaPods(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "CocoaPods", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "CocoaPodsProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<CocoaPods>("CocoaPods") {
         override val globsForDefinitionFiles = listOf("Podfile")
 
diff --git a/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-no-deps.yml b/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-no-deps.yml
index b745cb73e9733..c70ebe8c904f9 100644
--- a/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-no-deps.yml
+++ b/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-no-deps.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Composer:ort:composer-test-project:0.1.0"
+  id: "ComposerProject:ort:composer-test-project:0.1.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-provide.yml b/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-provide.yml
index 7141dc7e05386..a1a2b1f2a620e 100644
--- a/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-provide.yml
+++ b/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-provide.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Composer:ort:composer-test-project:0.1.0"
+  id: "ComposerProject:ort:composer-test-project:0.1.0"
   definition_file_path: "plugins/package-managers/composer/src/funTest/assets/projects/synthetic/with-provide/composer.json"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-replace.yml b/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-replace.yml
index 8394ae878cde3..045a6e05b0cad 100644
--- a/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-replace.yml
+++ b/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output-with-replace.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Composer:ort:composer-test-project:0.1.0"
+  id: "ComposerProject:ort:composer-test-project:0.1.0"
   definition_file_path: "plugins/package-managers/composer/src/funTest/assets/projects/synthetic/with-replace/composer.json"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output.yml b/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output.yml
index d7038b7f345db..686d11eb1e814 100644
--- a/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output.yml
+++ b/plugins/package-managers/composer/src/funTest/assets/projects/synthetic/composer-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Composer:ort:composer-test-project:0.1.0"
+  id: "ComposerProject:ort:composer-test-project:0.1.0"
   definition_file_path: "plugins/package-managers/composer/src/funTest/assets/projects/synthetic/lockfile/composer.json"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/composer/src/funTest/kotlin/ComposerFunTest.kt b/plugins/package-managers/composer/src/funTest/kotlin/ComposerFunTest.kt
index c5f1f9491e740..e7f751a63797a 100644
--- a/plugins/package-managers/composer/src/funTest/kotlin/ComposerFunTest.kt
+++ b/plugins/package-managers/composer/src/funTest/kotlin/ComposerFunTest.kt
@@ -68,7 +68,7 @@ class ComposerFunTest : StringSpec({
 
         with(result) {
             project.id shouldBe Identifier(
-                "Composer::src/funTest/assets/projects/synthetic/no-lockfile/composer.json:"
+                "ComposerProject::src/funTest/assets/projects/synthetic/no-lockfile/composer.json:"
             )
             project.definitionFilePath shouldBe "plugins/package-managers/composer/src/funTest/assets/projects/" +
                 "synthetic/no-lockfile/composer.json"
diff --git a/plugins/package-managers/composer/src/main/kotlin/Composer.kt b/plugins/package-managers/composer/src/main/kotlin/Composer.kt
index c3d0639141fcf..a1b6711703019 100644
--- a/plugins/package-managers/composer/src/main/kotlin/Composer.kt
+++ b/plugins/package-managers/composer/src/main/kotlin/Composer.kt
@@ -88,7 +88,7 @@ class Composer(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Composer", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "ComposerProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Composer>("Composer") {
         override val globsForDefinitionFiles = listOf("composer.json")
 
diff --git a/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py-lockfile.yml b/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py-lockfile.yml
index b404e658ef837..c115d5ba0731a 100644
--- a/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py-lockfile.yml
+++ b/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py-lockfile.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Conan::poco:"
+  id: "ConanProject::poco:"
   definition_file_path: "plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-py-lockfile/conanfile.py"
   declared_licenses:
   - "BSL-1.0"
diff --git a/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py.yml b/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py.yml
index f9e14bb83bdfa..4c10c208cc18e 100644
--- a/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py.yml
+++ b/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Conan::poco:"
+  id: "ConanProject::poco:"
   definition_file_path: "plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-py/conanfile.py"
   declared_licenses:
   - "BSL-1.0"
diff --git a/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-txt.yml b/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-txt.yml
index ee04cb96e4efc..de1994efb4090 100644
--- a/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-txt.yml
+++ b/plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-txt.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Conan::conanfile.txt:"
+  id: "ConanProject::conanfile.txt:"
   definition_file_path: "plugins/package-managers/conan/src/funTest/assets/projects/synthetic/conan-txt/conanfile.txt"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/conan/src/main/kotlin/Conan.kt b/plugins/package-managers/conan/src/main/kotlin/Conan.kt
index 1dd899e18c427..8d314692e969e 100644
--- a/plugins/package-managers/conan/src/main/kotlin/Conan.kt
+++ b/plugins/package-managers/conan/src/main/kotlin/Conan.kt
@@ -97,7 +97,7 @@ class Conan(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Conan", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "ConanProject", analysisRoot, analyzerConfig, repoConfig) {
     companion object {
         /**
          * The name of the option to specify the name of the lockfile.
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed-expected-output.yml
index 5dc54722d1a57..6d6f19b1cd079 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "GoMod::gomod_dangling_embed:<REPLACE_REVISION>"
+  id: "GoModProject::gomod_dangling_embed:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml
index 9f9c0b84ad987..292e69e1d4f7f 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "GoMod::my-module:<REPLACE_REVISION>"
+  id: "GoModProject::my-module:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/no-deps-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/no-deps-expected-output.yml
index 70c3e8572cec5..5a69a0ab19f7b 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/no-deps-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/no-deps-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "GoMod::gomod_no_deps:<REPLACE_REVISION>"
+  id: "GoModProject::gomod_no_deps:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml
index 5ab21eefd8883..5ab4430f72dae 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "GoMod::github.com/oss-review-toolkit/ort/gomod-synthetic-test-project:<REPLACE_REVISION>"
+  id: "GoModProject::github.com/oss-review-toolkit/ort/gomod-synthetic-test-project:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml
index 1ebf6e144e3d3..42f3eeaaf9782 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 projects:
-- id: "GoMod::app:<REPLACE_REVISION>"
+- id: "GoModProject::app:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -36,7 +36,7 @@ projects:
           linkage: "PROJECT_STATIC"
       - id: "Go::golang.org/x/sys:0.6.0"
         linkage: "PROJECT_STATIC"
-    - id: "GoMod::utils:<REPLACE_REVISION>"
+    - id: "GoModProject::utils:<REPLACE_REVISION>"
       linkage: "PROJECT_STATIC"
       dependencies:
       - id: "Go::github.com/google/uuid:1.0.0"
@@ -66,7 +66,7 @@ projects:
           linkage: "PROJECT_STATIC"
       - id: "Go::golang.org/x/sys:0.6.0"
         linkage: "PROJECT_STATIC"
-    - id: "GoMod::utils:<REPLACE_REVISION>"
+    - id: "GoModProject::utils:<REPLACE_REVISION>"
       linkage: "PROJECT_STATIC"
       dependencies:
       - id: "Go::github.com/google/uuid:1.0.0"
@@ -76,7 +76,7 @@ projects:
         dependencies:
         - id: "Go::github.com/google/uuid:1.0.0"
           linkage: "PROJECT_STATIC"
-- id: "GoMod::utils:<REPLACE_REVISION>"
+- id: "GoModProject::utils:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH_UTILS>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml
index 3f7d8a446da52..e08ef641a7af6 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "GoMod::github.com/oss-review-toolkit/ort/gomod-synthetic-test-project:<REPLACE_REVISION>"
+  id: "GoModProject::github.com/oss-review-toolkit/ort/gomod-synthetic-test-project:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps-expected-output.yml
index c74ddfca2828c..9cf501e597fe6 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "GoMod::gomod_unused_deps:<REPLACE_REVISION>"
+  id: "GoModProject::gomod_unused_deps:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-main-module-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-main-module-expected-output.yml
index 5c7cc7e68e3fc..9c25b74c178e9 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-main-module-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-main-module-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "GoMod::github.com/oss-review-toolkit/ort/gomod-workspaces:<REPLACE_REVISION>"
+  id: "GoModProject::github.com/oss-review-toolkit/ort/gomod-workspaces:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-sub-module-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-sub-module-expected-output.yml
index 82de16e0b09d7..d1b922b911ee5 100644
--- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-sub-module-expected-output.yml
+++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-sub-module-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "GoMod::github.com/oss-review-toolkit/ort/gomod-workspaces/other-module:<REPLACE_REVISION>"
+  id: "GoModProject::github.com/oss-review-toolkit/ort/gomod-workspaces/other-module:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/go/src/main/kotlin/GoMod.kt b/plugins/package-managers/go/src/main/kotlin/GoMod.kt
index c4e89902ce9cf..97679fb92cd43 100644
--- a/plugins/package-managers/go/src/main/kotlin/GoMod.kt
+++ b/plugins/package-managers/go/src/main/kotlin/GoMod.kt
@@ -90,7 +90,7 @@ class GoMod(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "GoMod", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "GoModProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<GoMod>("GoMod") {
         override val globsForDefinitionFiles = listOf("go.mod")
 
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml
index d8a04d35d8c8d..b1fdf0b06b1f1 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml
@@ -2,7 +2,7 @@
 project_results:
   <REPLACE_ABSOLUTE_DEFINITION_FILE_PATH>:
   - project:
-      id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+      id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
       definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle"
       declared_licenses: []
       declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml
index c82567cdd6c02..da708137639a9 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,14 +18,14 @@ project:
   scopes:
   - name: "amazonDemoDebugAndroidTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoDebugAndroidTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -37,14 +37,14 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoDebugCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoDebugRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -56,7 +56,7 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoDebugUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
@@ -66,7 +66,7 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonDemoDebugUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -81,14 +81,14 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonDemoReleaseCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoReleaseRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -100,7 +100,7 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoReleaseUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
@@ -110,7 +110,7 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonDemoReleaseUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -125,14 +125,14 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonFullDebugAndroidTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullDebugAndroidTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -144,14 +144,14 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullDebugCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullDebugRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -163,7 +163,7 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullDebugUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
@@ -173,7 +173,7 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonFullDebugUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -188,14 +188,14 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonFullReleaseCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullReleaseRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -207,7 +207,7 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullReleaseUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
@@ -217,7 +217,7 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonFullReleaseUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -232,11 +232,11 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleDemoDebugAndroidTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleDemoDebugAndroidTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -245,11 +245,11 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleDemoDebugCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleDemoDebugRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -258,14 +258,14 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleDemoDebugUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:junit:junit:4.12"
       dependencies:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleDemoDebugUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -277,11 +277,11 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleDemoReleaseCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleDemoReleaseRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -290,14 +290,14 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleDemoReleaseUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:junit:junit:4.12"
       dependencies:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleDemoReleaseUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -309,11 +309,11 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleFullDebugAndroidTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleFullDebugAndroidTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -322,11 +322,11 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleFullDebugCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleFullDebugRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -335,14 +335,14 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleFullDebugUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:junit:junit:4.12"
       dependencies:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleFullDebugUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -354,11 +354,11 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleFullReleaseCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleFullReleaseRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -367,14 +367,14 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleFullReleaseUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:junit:junit:4.12"
       dependencies:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleFullReleaseUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml
index c07ace4da420e..31b4043d890e6 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml
index bf608f7ea2e58..27cec3b05575c 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:Gradle-Android-Example:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:Gradle-Android-Example:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml
index d6482a20550a9..3923082bff01c 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:Gradle-BOM-Example:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:Gradle-BOM-Example:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml
index b7c4acfaec3ba..0845e65a6ef65 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.composite.example:my.project1:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example:my.project1:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,21 +18,21 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:log4j:log4j:1.2.17"
   - name: "testCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "testRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:log4j:log4j:1.2.17"
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml
index 1543bba1ddbb6..770ba46e521ad 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,7 +18,7 @@ project:
   scopes:
   - name: "compile"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -27,7 +27,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "compileOnly"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -36,7 +36,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "default"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -45,7 +45,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "runtime"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -54,7 +54,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompile"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -63,7 +63,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompileOnly"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -72,7 +72,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testRuntime"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml
index a4e231c3b1483..2e963578feddb 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,7 +18,7 @@ project:
   scopes:
   - name: "compile"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -27,7 +27,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "default"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -36,7 +36,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "runtime"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -45,7 +45,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompile"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -54,7 +54,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testRuntime"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml
index 6d11c8dc008f4..1bfbdc18bfd1f 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,11 +18,11 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -31,11 +31,11 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "testRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml
index ed98762ff10ec..54dcbab06606d 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml
index 55c5b5692af10..6640fc939e30b 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml
index 36926123a2b5e..f4f56930c7b1d 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle::Gradle-Example:"
+  id: "GradleProject::Gradle-Example:"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml
index f6e7c238cf87e..f246bc7094a5b 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,11 +18,11 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml
index 33a6e8362e262..73fabb1b19383 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:gradle-unsupported-version:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:gradle-unsupported-version:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml
index ab491e1ad8a9c..8ae751b0b432b 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,7 +18,7 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -26,7 +26,7 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.5"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -35,7 +35,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -43,7 +43,7 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.5"
   - name: "testRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml
index cde076cb47210..b9efd219f1b1b 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml
index 4711134c0d9ec..378278fe97876 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle::Gradle-Example:"
+  id: "GradleProject::Gradle-Example:"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml
index 34fed057e107a..6bd62cb041b48 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:cli:1.0"
+  id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:cli:1.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,7 +18,7 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
       dependencies:
@@ -134,7 +134,7 @@ project:
         - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
@@ -147,7 +147,7 @@ project:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20"
   - name: "testCompileClasspath"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
       dependencies:
@@ -155,7 +155,7 @@ project:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20"
   - name: "testRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml
index 30f0d38bfdbc9..415d443cd1afb 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+  id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml
index bc385acee4d12..c403f8ada5777 100644
--- a/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml
+++ b/plugins/package-managers/gradle-inspector/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:multi-kotlin-project:1.0"
+  id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:multi-kotlin-project:1.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle-inspector/src/main/kotlin/GradleInspector.kt b/plugins/package-managers/gradle-inspector/src/main/kotlin/GradleInspector.kt
index c5715803f8e5d..13eb644da4f1c 100644
--- a/plugins/package-managers/gradle-inspector/src/main/kotlin/GradleInspector.kt
+++ b/plugins/package-managers/gradle-inspector/src/main/kotlin/GradleInspector.kt
@@ -105,7 +105,7 @@ class GradleInspector(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Gradle", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "GradleProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<GradleInspector>("GradleInspector") {
         // Gradle prefers Groovy ".gradle" files over Kotlin ".gradle.kts" files, but "build" files have to come before
         // "settings" files as we should consider "settings" files only if the same directory does not also contain a
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml
index d8a04d35d8c8d..b1fdf0b06b1f1 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml
@@ -2,7 +2,7 @@
 project_results:
   <REPLACE_ABSOLUTE_DEFINITION_FILE_PATH>:
   - project:
-      id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+      id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
       definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle"
       declared_licenses: []
       declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml
index 999880d3047b9..17fc486ba8a11 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,14 +18,14 @@ project:
   scopes:
   - name: "amazonDemoDebugAndroidTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoDebugAndroidTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -37,14 +37,14 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoDebugCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoDebugRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -56,7 +56,7 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoDebugUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
@@ -66,7 +66,7 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonDemoDebugUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -81,14 +81,14 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonDemoReleaseCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoReleaseRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -100,7 +100,7 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonDemoReleaseUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
@@ -110,7 +110,7 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonDemoReleaseUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -125,14 +125,14 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonFullDebugAndroidTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullDebugAndroidTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -144,14 +144,14 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullDebugCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullDebugRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -163,7 +163,7 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullDebugUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
@@ -173,7 +173,7 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonFullDebugUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -188,14 +188,14 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonFullReleaseCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullReleaseRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -207,7 +207,7 @@ project:
       - id: "Maven:com.squareup.okio:okio:1.14.0"
   - name: "amazonFullReleaseUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:com.squareup.okhttp3:okhttp:3.10.0"
       dependencies:
@@ -217,7 +217,7 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "amazonFullReleaseUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -232,11 +232,11 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleDemoDebugAndroidTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleDemoDebugAndroidTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -245,11 +245,11 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleDemoDebugCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleDemoDebugRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -258,14 +258,14 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleDemoDebugUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:junit:junit:4.12"
       dependencies:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleDemoDebugUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -277,11 +277,11 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleDemoReleaseCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleDemoReleaseRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -290,14 +290,14 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleDemoReleaseUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:junit:junit:4.12"
       dependencies:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleDemoReleaseUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -309,11 +309,11 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleFullDebugAndroidTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleFullDebugAndroidTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -322,11 +322,11 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleFullDebugCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleFullDebugRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -335,14 +335,14 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleFullDebugUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:junit:junit:4.12"
       dependencies:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleFullDebugUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -354,11 +354,11 @@ project:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleFullReleaseCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "googleFullReleaseRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
@@ -367,14 +367,14 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.7"
   - name: "googleFullReleaseUnitTestCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:junit:junit:4.12"
       dependencies:
       - id: "Maven:org.hamcrest:hamcrest-core:1.3"
   - name: "googleFullReleaseUnitTestRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-compress:1.17"
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml
index c07ace4da420e..31b4043d890e6 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml
index bf608f7ea2e58..27cec3b05575c 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:Gradle-Android-Example:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:Gradle-Android-Example:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml
index d6482a20550a9..3923082bff01c 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:Gradle-BOM-Example:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:Gradle-BOM-Example:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml
index b7c4acfaec3ba..0845e65a6ef65 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.composite.example:my.project1:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example:my.project1:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,21 +18,21 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:log4j:log4j:1.2.17"
   - name: "testCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "testRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.composite.example3:sub:3.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:log4j:log4j:1.2.17"
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml
index 1543bba1ddbb6..770ba46e521ad 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,7 +18,7 @@ project:
   scopes:
   - name: "compile"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -27,7 +27,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "compileOnly"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -36,7 +36,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "default"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -45,7 +45,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "runtime"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -54,7 +54,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompile"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -63,7 +63,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompileOnly"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -72,7 +72,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testRuntime"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml
index a4e231c3b1483..2e963578feddb 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,7 +18,7 @@ project:
   scopes:
   - name: "compile"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -27,7 +27,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "default"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -36,7 +36,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "runtime"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -45,7 +45,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompile"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -54,7 +54,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testRuntime"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml
index 6d11c8dc008f4..1bfbdc18bfd1f 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,11 +18,11 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -31,11 +31,11 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "testRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml
index 33d878fce6efd..c7e6ac3b6475e 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml
index 55c5b5692af10..6640fc939e30b 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml
index 36926123a2b5e..f4f56930c7b1d 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle::Gradle-Example:"
+  id: "GradleProject::Gradle-Example:"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml
index f6e7c238cf87e..f246bc7094a5b 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,11 +18,11 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml
index 33a6e8362e262..73fabb1b19383 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:gradle-unsupported-version:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:gradle-unsupported-version:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml
index ab491e1ad8a9c..8ae751b0b432b 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:app:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,7 +18,7 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -26,7 +26,7 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.5"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -35,7 +35,7 @@ project:
       - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1"
   - name: "testCompileClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -43,7 +43,7 @@ project:
         - id: "Maven:org.apache.commons:commons-lang3:3.5"
   - name: "testRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+    - id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.commons:commons-text:1.1"
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml
index cde076cb47210..b9efd219f1b1b 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
+  id: "GradleProject:org.ossreviewtoolkit.gradle.example:lib:1.0.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml
index 4711134c0d9ec..378278fe97876 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle::Gradle-Example:"
+  id: "GradleProject::Gradle-Example:"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/build.gradle"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml
index 6768710a68001..d60677ab7388d 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:cli:1.0"
+  id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:cli:1.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,7 +18,7 @@ project:
   scopes:
   - name: "compileClasspath"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
       dependencies:
@@ -26,7 +26,7 @@ project:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20"
   - name: "implementationDependenciesMetadata"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
       dependencies:
@@ -142,7 +142,7 @@ project:
         - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20"
   - name: "runtimeClasspath"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
@@ -155,7 +155,7 @@ project:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20"
   - name: "testCompileClasspath"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
       dependencies:
@@ -163,7 +163,7 @@ project:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20"
   - name: "testImplementationDependenciesMetadata"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
     - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
       dependencies:
@@ -171,7 +171,7 @@ project:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20"
   - name: "testRuntimeClasspath"
     dependencies:
-    - id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+    - id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml
index bdbdfb7fd6eb8..ae1d43423876a 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
+  id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml
index bc385acee4d12..c403f8ada5777 100644
--- a/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml
+++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:multi-kotlin-project:1.0"
+  id: "GradleProject:org.gradle.kotlin.dsl.samples.multiproject:multi-kotlin-project:1.0"
   definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/gradle/src/main/kotlin/Gradle.kt b/plugins/package-managers/gradle/src/main/kotlin/Gradle.kt
index a710777f7399e..f12be0df61cbb 100644
--- a/plugins/package-managers/gradle/src/main/kotlin/Gradle.kt
+++ b/plugins/package-managers/gradle/src/main/kotlin/Gradle.kt
@@ -91,7 +91,7 @@ class Gradle(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Gradle", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "GradleProject", analysisRoot, analyzerConfig, repoConfig) {
     companion object {
         /**
          * The name of the option to specify the Gradle version.
diff --git a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-app.yml b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-app.yml
index 5d3a9c8f41d63..10cd50dcd0df3 100644
--- a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-app.yml
+++ b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-app.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Maven:org.ossreviewtoolkit.maven:maven-app:1.0-SNAPSHOT"
+  id: "MavenProject:org.ossreviewtoolkit.maven:maven-app:1.0-SNAPSHOT"
   definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven/app/pom.xml"
   authors:
   - "Google"
@@ -25,7 +25,7 @@ project:
   scopes:
   - name: "compile"
     dependencies:
-    - id: "Maven:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
+    - id: "MavenProject:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
       linkage: "PROJECT_DYNAMIC"
       dependencies:
       - id: "Maven:org.apache.beam:beam-parent:2.3.0"
diff --git a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-lib.yml b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-lib.yml
index c200c8fd6809a..c75b108642f89 100644
--- a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-lib.yml
+++ b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-lib.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Maven:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
+  id: "MavenProject:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
   definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven/lib/pom.xml"
   authors:
   - "Google"
diff --git a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-root.yml b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-root.yml
index 552025f2e9280..d5f8d7dd65954 100644
--- a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-root.yml
+++ b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Maven:org.ossreviewtoolkit.maven:maven-project:1.0-SNAPSHOT"
+  id: "MavenProject:org.ossreviewtoolkit.maven:maven-project:1.0-SNAPSHOT"
   definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven/pom.xml"
   authors:
   - "Google"
diff --git a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-scope-excludes.yml b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-scope-excludes.yml
index ed44015981698..c2357feffefc0 100644
--- a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-scope-excludes.yml
+++ b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-expected-output-scope-excludes.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Maven:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
+  id: "MavenProject:org.ossreviewtoolkit.maven:maven-lib:1.0-SNAPSHOT"
   definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven/lib/pom.xml"
   authors:
   - "Google"
diff --git a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-parent-expected-output-root.yml b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-parent-expected-output-root.yml
index bd02b91929b3e..da9fb80ca373b 100644
--- a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-parent-expected-output-root.yml
+++ b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-parent-expected-output-root.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Maven:org.ossreviewtoolkit.maven:maven-parent-project:1.0-SNAPSHOT"
+  id: "MavenProject:org.ossreviewtoolkit.maven:maven-parent-project:1.0-SNAPSHOT"
   definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-parent/pom.xml"
   authors:
   - "Pivotal Software, Inc."
diff --git a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-wagon-expected-output.yml b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-wagon-expected-output.yml
index 2b7e7d12d60d9..c399e24929b4d 100644
--- a/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-wagon-expected-output.yml
+++ b/plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-wagon-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Maven:org.ossreviewtoolkit.maven:maven-project:1.0-SNAPSHOT"
+  id: "MavenProject:org.ossreviewtoolkit.maven:maven-project:1.0-SNAPSHOT"
   definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven-wagon/pom.xml"
   declared_licenses:
   - "Apache License, Version 2.0"
diff --git a/plugins/package-managers/maven/src/main/kotlin/Maven.kt b/plugins/package-managers/maven/src/main/kotlin/Maven.kt
index a9d0a4100f5d8..8a83d306152ee 100644
--- a/plugins/package-managers/maven/src/main/kotlin/Maven.kt
+++ b/plugins/package-managers/maven/src/main/kotlin/Maven.kt
@@ -62,7 +62,11 @@ class Maven(
 ) : PackageManager(
     name,
     // The "options" convenience property from "PackageManager" is not available here yet.
-    if (analyzerConfig.getPackageManagerConfiguration(name)?.options?.get("sbtMode").toBoolean()) "SBT" else "Maven",
+    if (analyzerConfig.getPackageManagerConfiguration(name)?.options?.get("sbtMode").toBoolean()) {
+        "SBTProject"
+    } else {
+        "MavenProject"
+    },
     analysisRoot,
     analyzerConfig,
     repoConfig
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/babel-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/babel-expected-output.yml
index d254f54fc5cf5..6fe16950cb634 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/babel-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/babel-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "NPM::npm-project-that-depends-on-babel:1.0.0"
+  id: "NPMProject::npm-project-that-depends-on-babel:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/babel/package.json"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/no-lockfile-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/no-lockfile-expected-output.yml
index 82d211d92223c..ad1fdc743c0ce 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/no-lockfile-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/no-lockfile-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "NPM::src/funTest/assets/projects/synthetic/npm/no-lockfile/package.json:"
+  id: "NPMProject::src/funTest/assets/projects/synthetic/npm/no-lockfile/package.json:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/node-modules-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/node-modules-expected-output.yml
index 74ae0e89feb4c..b2525e203a137 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/node-modules-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/node-modules-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "NPM::npm-node-modules:1.0.0"
+  id: "NPMProject::npm-node-modules:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile-expected-output.yml
index 26eeea0b426db..b3b10558c9ade 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "NPM::npm-package-lock:1.0.0"
+  id: "NPMProject::npm-package-lock:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-expected-output.yml
index e8938f2b28ad3..480055bf2093a 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "NPM::<REPLACE_PROJECT_NAME>:1.0.0"
+  id: "NPMProject::<REPLACE_PROJECT_NAME>:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-skip-excluded-scopes-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-skip-excluded-scopes-expected-output.yml
index 036f1e9038ca9..c561c06ac6b9a 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-skip-excluded-scopes-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-skip-excluded-scopes-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "NPM::npm-shrinkwrap:1.0.0"
+  id: "NPMProject::npm-shrinkwrap:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/version-urls-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/version-urls-expected-output.yml
index b331262eecb98..35af23df05eef 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/version-urls-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/version-urls-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "NPM::npm-version-urls:1.0.0"
+  id: "NPMProject::npm-version-urls:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/babel-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/babel-expected-output.yml
index c0485116cf7f2..96fb013ed683c 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/babel-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/babel-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PNPM::npm-project-that-depends-on-babel:1.0.0"
+  id: "PNPMProject::npm-project-that-depends-on-babel:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/babel/package.json"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml
index b519f5df78648..010367835528f 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PNPM::pnpm-package-with-lockfile:1.0.0"
+  id: "PNPMProject::pnpm-package-with-lockfile:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-skip-excluded-scopes-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-skip-excluded-scopes-expected-output.yml
index 3d250626d81b5..8a5add2594d43 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-skip-excluded-scopes-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-skip-excluded-scopes-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PNPM::pnpm-package-with-lockfile:1.0.0"
+  id: "PNPMProject::pnpm-package-with-lockfile:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces-expected-output.yml
index b604c3b87056a..5a9dfed737609 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces-expected-output.yml
@@ -28,7 +28,7 @@ analyzer:
     skip_excluded: false
   result:
     projects:
-    - id: "PNPM::pnpm-app-example:1.1.4"
+    - id: "PNPMProject::pnpm-app-example:1.1.4"
       definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces/src/app/package.json"
       authors:
       - "DavidWells"
@@ -50,7 +50,7 @@ analyzer:
       scopes:
       - name: "dependencies"
         dependencies:
-        - id: "PNPM::testing-pnpm-package-a:1.0.2"
+        - id: "PNPMProject::testing-pnpm-package-a:1.0.2"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "NPM::chalk:5.0.1"
@@ -64,7 +64,7 @@ analyzer:
                   dependencies:
                   - id: "NPM::is-buffer:1.1.6"
           - id: "NPM::sax:1.2.4"
-    - id: "PNPM::pnpm-workspaces:1.0.1"
+    - id: "PNPMProject::pnpm-workspaces:1.0.1"
       definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces/package.json"
       authors:
       - "Marcel Bochtler"
@@ -90,15 +90,15 @@ analyzer:
         - id: "NPM::json-stable-stringify:1.0.1"
           dependencies:
           - id: "NPM::jsonify:0.0.0"
-        - id: "PNPM::pnpm-workspaces:1.0.1"
+        - id: "PNPMProject::pnpm-workspaces:1.0.1"
           linkage: "PROJECT_DYNAMIC"
           dependencies:
           - id: "NPM::json-stable-stringify:1.0.1"
             dependencies:
             - id: "NPM::jsonify:0.0.0"
-          - id: "PNPM::pnpm-workspaces:1.0.1"
+          - id: "PNPMProject::pnpm-workspaces:1.0.1"
             linkage: "PROJECT_DYNAMIC"
-    - id: "PNPM::testing-pnpm-package-a:1.0.2"
+    - id: "PNPMProject::testing-pnpm-package-a:1.0.2"
       definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces/src/packages/package-a/package.json"
       authors:
       - "Marcel Bochtler"
@@ -139,7 +139,7 @@ analyzer:
             dependencies:
             - id: "NPM::callsites:0.2.0"
           - id: "NPM::resolve-from:1.0.1"
-    - id: "PNPM::testing-pnpm-package-b:1.0.2"
+    - id: "PNPMProject::testing-pnpm-package-b:1.0.2"
       definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces/src/packages/package-b/package.json"
       authors:
       - "Marcel Bochtler"
@@ -171,7 +171,7 @@ analyzer:
           - id: "NPM::supports-color:7.2.0"
             dependencies:
             - id: "NPM::has-flag:4.0.0"
-    - id: "PNPM::testing-pnpm-package-c:1.0.0"
+    - id: "PNPMProject::testing-pnpm-package-c:1.0.0"
       definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/workspaces/src/non-workspace/package-c/package.json"
       authors:
       - "Marcel Bochtler"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/babel-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/babel-expected-output.yml
index 03023a35a173e..441db95941892 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/babel-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/babel-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Yarn::npm-project-that-depends-on-babel:1.0.0"
+  id: "YarnProject::npm-project-that-depends-on-babel:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/babel/package.json"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml
index 0006e76eee6a8..6fcb2351f0c86 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Yarn::yarn-package-with-lockfile:1.0.0"
+  id: "YarnProject::yarn-package-with-lockfile:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/workspaces-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/workspaces-expected-output.yml
index a2a7354e70a42..519f23a1e2558 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/workspaces-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/workspaces-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 projects:
-- id: "Yarn::pkg2:1.0.0"
+- id: "YarnProject::pkg2:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/workspaces/packages/pkg2/package.json"
   declared_licenses:
   - "Apache-2.0"
@@ -23,7 +23,7 @@ projects:
     - id: "NPM:@here:harp-fetch:0.3.6"
       dependencies:
       - id: "NPM::node-fetch:2.6.0"
-- id: "Yarn::workspace:1.0.0"
+- id: "YarnProject::workspace:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/workspaces/package.json"
   declared_licenses:
   - "Apache-2.0"
@@ -42,7 +42,7 @@ projects:
   description: "Yarn test project using Yarn workspaces."
   homepage_url: ""
   scopes: []
-- id: "Yarn:@scope1:pkg1:1.0.0"
+- id: "YarnProject:@scope1:pkg1:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/workspaces/packages/pkg1/package.json"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml
index 99da43c43791a..62176aa65363c 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Yarn2::yarn2-package-with-lockfile:1.0.0"
+  id: "Yarn2Project::yarn2-package-with-lockfile:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "The Author"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml
index 79eff5c71fabd..fe054f44a32cf 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml
@@ -1,9 +1,7 @@
 ---
 project:
-  id: "Yarn2::yarn2-package-with-lockfile:1.0.0"
+  id: "Yarn2Project::yarn2-package-with-lockfile:1.0.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
-  authors:
-  - "The Author"
   declared_licenses:
   - "Apache-2.0"
   declared_licenses_processed:
@@ -18,7 +16,6 @@ project:
     url: "<REPLACE_URL_PROCESSED>"
     revision: "<REPLACE_REVISION>"
     path: "<REPLACE_PATH>"
-  description: "Yarn test project with yarn.lock."
   homepage_url: ""
   scopes:
   - name: "dependencies"
@@ -31,10 +28,10 @@ project:
         - id: "NPM::css-what:2.1.3"
         - id: "NPM::domutils:1.5.1"
           dependencies:
-          - id: "NPM::dom-serializer:0.2.2"
+          - id: "NPM::dom-serializer:0.1.1"
             dependencies:
-            - id: "NPM::domelementtype:2.3.0"
-            - id: "NPM::entities:2.2.0"
+            - id: "NPM::domelementtype:1.3.1"
+            - id: "NPM::entities:1.1.2"
           - id: "NPM::domelementtype:1.3.1"
         - id: "NPM::nth-check:1.0.2"
           dependencies:
@@ -50,28 +47,26 @@ project:
         - id: "NPM::domhandler:2.4.2"
           dependencies:
           - id: "NPM::domelementtype:1.3.1"
-        - id: "NPM::domutils:1.7.0"
+        - id: "NPM::domutils:1.5.1"
           dependencies:
-          - id: "NPM::dom-serializer:0.2.2"
+          - id: "NPM::dom-serializer:0.1.1"
             dependencies:
-            - id: "NPM::domelementtype:2.3.0"
-            - id: "NPM::entities:2.2.0"
+            - id: "NPM::domelementtype:1.3.1"
+            - id: "NPM::entities:1.1.2"
           - id: "NPM::domelementtype:1.3.1"
         - id: "NPM::entities:1.1.2"
         - id: "NPM::inherits:2.0.4"
-        - id: "NPM::readable-stream:3.6.2"
+        - id: "NPM::readable-stream:3.4.0"
           dependencies:
           - id: "NPM::inherits:2.0.4"
-          - id: "NPM::string_decoder:1.3.0"
+          - id: "NPM::string_decoder:1.2.0"
             dependencies:
-            - id: "NPM::safe-buffer:5.2.1"
+            - id: "NPM::safe-buffer:5.1.2"
           - id: "NPM::util-deprecate:1.0.2"
-      - id: "NPM::lodash:4.17.21"
+      - id: "NPM::lodash:4.17.15"
       - id: "NPM::parse5:3.0.3"
         dependencies:
-        - id: "NPM:@types:node:22.9.0"
-          dependencies:
-          - id: "NPM::undici-types:6.19.8"
+        - id: "NPM:@types:node:12.6.8"
     - id: "NPM::long:3.2.0"
     - id: "NPM::promise:7.3.1"
       dependencies:
@@ -258,36 +253,6 @@ packages:
     url: "https://github.com/cheeriojs/dom-renderer.git"
     revision: "1b9eb87c621a184b97467b03600b50d08e5a5086"
     path: ""
-- id: "NPM::dom-serializer:0.2.2"
-  purl: "pkg:npm/dom-serializer@0.2.2"
-  authors:
-  - "Felix Boehm"
-  declared_licenses:
-  - "MIT"
-  declared_licenses_processed:
-    spdx_expression: "MIT"
-  description: "render dom nodes to string"
-  homepage_url: "https://github.com/cheeriojs/dom-renderer#readme"
-  binary_artifact:
-    url: ""
-    hash:
-      value: ""
-      algorithm: ""
-  source_artifact:
-    url: "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"
-    hash:
-      value: "1afb81f533717175d478655debc5e332d9f9bb51"
-      algorithm: "SHA-1"
-  vcs:
-    type: "Git"
-    url: "git://github.com/cheeriojs/dom-renderer.git"
-    revision: "1451bf260586d612314820be41b2b89528f01155"
-    path: ""
-  vcs_processed:
-    type: "Git"
-    url: "https://github.com/cheeriojs/dom-renderer.git"
-    revision: "1451bf260586d612314820be41b2b89528f01155"
-    path: ""
 - id: "NPM::domelementtype:1.3.1"
   purl: "pkg:npm/domelementtype@1.3.1"
   authors:
@@ -318,36 +283,6 @@ packages:
     url: "https://github.com/fb55/domelementtype.git"
     revision: "19b2491101a4de3679b59db8eb7fdd9aa0fbc60b"
     path: ""
-- id: "NPM::domelementtype:2.3.0"
-  purl: "pkg:npm/domelementtype@2.3.0"
-  authors:
-  - "Felix Boehm"
-  declared_licenses:
-  - "BSD-2-Clause"
-  declared_licenses_processed:
-    spdx_expression: "BSD-2-Clause"
-  description: "all the types of nodes in htmlparser2's dom"
-  homepage_url: "https://github.com/fb55/domelementtype#readme"
-  binary_artifact:
-    url: ""
-    hash:
-      value: ""
-      algorithm: ""
-  source_artifact:
-    url: "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"
-    hash:
-      value: "5c45e8e869952626331d7aab326d01daf65d589d"
-      algorithm: "SHA-1"
-  vcs:
-    type: "Git"
-    url: "git://github.com/fb55/domelementtype.git"
-    revision: "687e8625885a3656d44c41e7640c86925417d91f"
-    path: ""
-  vcs_processed:
-    type: "Git"
-    url: "https://github.com/fb55/domelementtype.git"
-    revision: "687e8625885a3656d44c41e7640c86925417d91f"
-    path: ""
 - id: "NPM::domhandler:2.4.2"
   purl: "pkg:npm/domhandler@2.4.2"
   authors:
@@ -406,36 +341,6 @@ packages:
     url: "https://github.com/FB55/domutils.git"
     revision: "7d4bd16cd36ffce62362ef91616806ea27e30d95"
     path: ""
-- id: "NPM::domutils:1.7.0"
-  purl: "pkg:npm/domutils@1.7.0"
-  authors:
-  - "Felix Boehm"
-  declared_licenses:
-  - "BSD-2-Clause"
-  declared_licenses_processed:
-    spdx_expression: "BSD-2-Clause"
-  description: "utilities for working with htmlparser2's dom"
-  homepage_url: "https://github.com/FB55/domutils#readme"
-  binary_artifact:
-    url: ""
-    hash:
-      value: ""
-      algorithm: ""
-  source_artifact:
-    url: "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"
-    hash:
-      value: "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-      algorithm: "SHA-1"
-  vcs:
-    type: "Git"
-    url: "git://github.com/FB55/domutils.git"
-    revision: "34f193ca17d11a98d9310b1965efe5f73d32d79f"
-    path: ""
-  vcs_processed:
-    type: "Git"
-    url: "https://github.com/FB55/domutils.git"
-    revision: "34f193ca17d11a98d9310b1965efe5f73d32d79f"
-    path: ""
 - id: "NPM::entities:1.1.2"
   purl: "pkg:npm/entities@1.1.2"
   authors:
@@ -466,36 +371,6 @@ packages:
     url: "https://github.com/fb55/entities.git"
     revision: "54a5717d85d886c4aafa2ac5ff83d8d3d730337c"
     path: ""
-- id: "NPM::entities:2.2.0"
-  purl: "pkg:npm/entities@2.2.0"
-  authors:
-  - "Felix Boehm"
-  declared_licenses:
-  - "BSD-2-Clause"
-  declared_licenses_processed:
-    spdx_expression: "BSD-2-Clause"
-  description: "Encode & decode XML and HTML entities with ease"
-  homepage_url: "https://github.com/fb55/entities#readme"
-  binary_artifact:
-    url: ""
-    hash:
-      value: ""
-      algorithm: ""
-  source_artifact:
-    url: "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
-    hash:
-      value: "098dc90ebb83d8dffa089d55256b351d34c4da55"
-      algorithm: "SHA-1"
-  vcs:
-    type: "Git"
-    url: "git://github.com/fb55/entities.git"
-    revision: "c60851e3c75869d8bfd00325d99fd3e644c504ba"
-    path: ""
-  vcs_processed:
-    type: "Git"
-    url: "https://github.com/fb55/entities.git"
-    revision: "c60851e3c75869d8bfd00325d99fd3e644c504ba"
-    path: ""
 - id: "NPM::htmlparser2:3.10.1"
   purl: "pkg:npm/htmlparser2@3.10.1"
   authors:
@@ -555,8 +430,8 @@ packages:
     url: "https://github.com/isaacs/inherits.git"
     revision: "9a2c29400c6d491e0b7beefe0c32efa3b462545d"
     path: ""
-- id: "NPM::lodash:4.17.21"
-  purl: "pkg:npm/lodash@4.17.21"
+- id: "NPM::lodash:4.17.15"
+  purl: "pkg:npm/lodash@4.17.15"
   authors:
   - "John-David Dalton"
   declared_licenses:
@@ -571,19 +446,19 @@ packages:
       value: ""
       algorithm: ""
   source_artifact:
-    url: "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+    url: "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"
     hash:
-      value: "679591c564c3bffaae8454cf0b3df370c3d6911c"
+      value: "b447f6670a0455bbfeedd11392eff330ea097548"
       algorithm: "SHA-1"
   vcs:
     type: "Git"
     url: "git+https://github.com/lodash/lodash.git"
-    revision: "c6e281b878b315c7a10d90f9c2af4cdb112d9625"
+    revision: ""
     path: ""
   vcs_processed:
     type: "Git"
     url: "https://github.com/lodash/lodash.git"
-    revision: "c6e281b878b315c7a10d90f9c2af4cdb112d9625"
+    revision: ""
     path: ""
 - id: "NPM::long:3.2.0"
   purl: "pkg:npm/long@3.2.0"
@@ -706,8 +581,8 @@ packages:
     url: "https://github.com/then/promise.git"
     revision: "cebfa6049cc08843f428c6fc92dde918f8687e6d"
     path: ""
-- id: "NPM::readable-stream:3.6.2"
-  purl: "pkg:npm/readable-stream@3.6.2"
+- id: "NPM::readable-stream:3.4.0"
+  purl: "pkg:npm/readable-stream@3.4.0"
   declared_licenses:
   - "MIT"
   declared_licenses_processed:
@@ -720,22 +595,22 @@ packages:
       value: ""
       algorithm: ""
   source_artifact:
-    url: "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
+    url: "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz"
     hash:
-      value: "56a9b36ea965c00c5a93ef31eb111a0f11056967"
+      value: "a51c26754658e0a3c21dbf59163bd45ba6f447fc"
       algorithm: "SHA-1"
   vcs:
     type: "Git"
     url: "git://github.com/nodejs/readable-stream.git"
-    revision: "6c32003bd8607da54f8ca1b096c4411778b060bc"
+    revision: "4ba93f84cf8812ca2af793c7304a5c16de72088a"
     path: ""
   vcs_processed:
     type: "Git"
     url: "https://github.com/nodejs/readable-stream.git"
-    revision: "6c32003bd8607da54f8ca1b096c4411778b060bc"
+    revision: "4ba93f84cf8812ca2af793c7304a5c16de72088a"
     path: ""
-- id: "NPM::safe-buffer:5.2.1"
-  purl: "pkg:npm/safe-buffer@5.2.1"
+- id: "NPM::safe-buffer:5.1.2"
+  purl: "pkg:npm/safe-buffer@5.1.2"
   authors:
   - "Feross Aboukhadijeh"
   declared_licenses:
@@ -750,22 +625,22 @@ packages:
       value: ""
       algorithm: ""
   source_artifact:
-    url: "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+    url: "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
     hash:
-      value: "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+      value: "991ec69d296e0313747d59bdfd2b745c35f8828d"
       algorithm: "SHA-1"
   vcs:
     type: "Git"
     url: "git://github.com/feross/safe-buffer.git"
-    revision: "89d3d5b4abd6308c6008499520373d204ada694b"
+    revision: "649435cc8e2d1f3ecdc7caf323f1cb1187307a16"
     path: ""
   vcs_processed:
     type: "Git"
     url: "https://github.com/feross/safe-buffer.git"
-    revision: "89d3d5b4abd6308c6008499520373d204ada694b"
+    revision: "649435cc8e2d1f3ecdc7caf323f1cb1187307a16"
     path: ""
-- id: "NPM::string_decoder:1.3.0"
-  purl: "pkg:npm/string_decoder@1.3.0"
+- id: "NPM::string_decoder:1.2.0"
+  purl: "pkg:npm/string_decoder@1.2.0"
   declared_licenses:
   - "MIT"
   declared_licenses_processed:
@@ -778,47 +653,19 @@ packages:
       value: ""
       algorithm: ""
   source_artifact:
-    url: "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+    url: "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"
     hash:
-      value: "42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+      value: "fe86e738b19544afe70469243b2a1ee9240eae8d"
       algorithm: "SHA-1"
   vcs:
     type: "Git"
     url: "git://github.com/nodejs/string_decoder.git"
-    revision: "60db81e031c126112039157ba9437484b1329dff"
+    revision: "6e0a9286ed4497badebd4ec6a9a7a4d37793aae8"
     path: ""
   vcs_processed:
     type: "Git"
     url: "https://github.com/nodejs/string_decoder.git"
-    revision: "60db81e031c126112039157ba9437484b1329dff"
-    path: ""
-- id: "NPM::undici-types:6.19.8"
-  purl: "pkg:npm/undici-types@6.19.8"
-  declared_licenses:
-  - "MIT"
-  declared_licenses_processed:
-    spdx_expression: "MIT"
-  description: "A stand-alone types package for Undici"
-  homepage_url: "https://undici.nodejs.org"
-  binary_artifact:
-    url: ""
-    hash:
-      value: ""
-      algorithm: ""
-  source_artifact:
-    url: "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz"
-    hash:
-      value: "35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
-      algorithm: "SHA-1"
-  vcs:
-    type: "Git"
-    url: "git+https://github.com/nodejs/undici.git"
-    revision: "3d3ce0695c8c3f9a8f3c8af90dd42d0569d3f0bb"
-    path: ""
-  vcs_processed:
-    type: "Git"
-    url: "https://github.com/nodejs/undici.git"
-    revision: "3d3ce0695c8c3f9a8f3c8af90dd42d0569d3f0bb"
+    revision: "6e0a9286ed4497badebd4ec6a9a7a4d37793aae8"
     path: ""
 - id: "NPM::util-deprecate:1.0.2"
   purl: "pkg:npm/util-deprecate@1.0.2"
@@ -850,13 +697,13 @@ packages:
     url: "https://github.com/TooTallNate/util-deprecate.git"
     revision: "475fb6857cd23fafff20c1be846c1350abf8e6d4"
     path: ""
-- id: "NPM:@types:node:22.9.0"
-  purl: "pkg:npm/%40types/node@22.9.0"
+- id: "NPM:@types:node:12.6.8"
+  purl: "pkg:npm/%40types/node@12.6.8"
   declared_licenses:
   - "MIT"
   declared_licenses_processed:
     spdx_expression: "MIT"
-  description: "TypeScript definitions for node"
+  description: "TypeScript definitions for Node.js"
   homepage_url: "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node"
   binary_artifact:
     url: ""
@@ -864,9 +711,9 @@ packages:
       value: ""
       algorithm: ""
   source_artifact:
-    url: "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz"
+    url: "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz"
     hash:
-      value: "b7f16e5c3384788542c72dc3d561a7ceae2c0365"
+      value: "e469b4bf9d1c9832aee4907ba8a051494357c12c"
       algorithm: "SHA-1"
   vcs:
     type: "Git"
diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/workspaces-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/workspaces-expected-output.yml
index 9ccb1082bb1f8..45c101bcd2d19 100644
--- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/workspaces-expected-output.yml
+++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/workspaces-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 projects:
-- id: "Yarn2::pkg2:1.0.0"
+- id: "Yarn2Project::pkg2:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/workspaces/packages/pkg2/package.json"
   declared_licenses:
   - "Apache-2.0"
@@ -23,7 +23,7 @@ projects:
     - id: "NPM:@here:harp-fetch:0.3.6"
       dependencies:
       - id: "NPM::node-fetch:2.6.0"
-- id: "Yarn2::workspace:1.0.0"
+- id: "Yarn2Project::workspace:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/workspaces/package.json"
   declared_licenses:
   - "Apache-2.0"
@@ -42,7 +42,7 @@ projects:
   description: "Yarn test project using Yarn workspaces."
   homepage_url: ""
   scopes: []
-- id: "Yarn2:@scope1:pkg1:1.0.0"
+- id: "Yarn2Project:@scope1:pkg1:1.0.0"
   definition_file_path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/workspaces/packages/pkg1/package.json"
   declared_licenses:
   - "Apache-2.0"
diff --git a/plugins/package-managers/node/src/main/kotlin/NodePackageManagerDetection.kt b/plugins/package-managers/node/src/main/kotlin/NodePackageManagerDetection.kt
index 3bba34b236b76..56c379d9bcd8f 100644
--- a/plugins/package-managers/node/src/main/kotlin/NodePackageManagerDetection.kt
+++ b/plugins/package-managers/node/src/main/kotlin/NodePackageManagerDetection.kt
@@ -117,7 +117,7 @@ enum class NodePackageManagerType(
     val workspaceFileName: String = NodePackageManagerType.DEFINITION_FILE
 ) {
     NPM(
-        projectType = "NPM",
+        projectType = "NPMProject",
         lockfileName = "package-lock.json", // See https://docs.npmjs.com/cli/v7/configuring-npm/package-lock-json.
         markerFileName = "npm-shrinkwrap.json" // See https://docs.npmjs.com/cli/v6/configuring-npm/shrinkwrap-json.
     ) {
@@ -126,7 +126,7 @@ enum class NodePackageManagerType(
     },
 
     PNPM(
-        projectType = "PNPM",
+        projectType = "PNPMProject",
         lockfileName = "pnpm-lock.yaml", // See https://pnpm.io/git#lockfiles.
         workspaceFileName = "pnpm-workspace.yaml"
     ) {
@@ -145,7 +145,7 @@ enum class NodePackageManagerType(
     },
 
     YARN(
-        projectType = "Yarn",
+        projectType = "YarnProject",
         lockfileName = "yarn.lock" // See https://classic.yarnpkg.com/en/docs/yarn-lock.
     ) {
         private val lockfileMarker = "# yarn lockfile v1"
@@ -161,7 +161,7 @@ enum class NodePackageManagerType(
     },
 
     YARN2(
-        projectType = "Yarn2",
+        projectType = "Yarn2Project",
         lockfileName = "yarn.lock", // See https://classic.yarnpkg.com/en/docs/yarn-lock.
         markerFileName = ".yarnrc.yml"
     ) {
diff --git a/plugins/package-managers/nuget/src/main/kotlin/NuGet.kt b/plugins/package-managers/nuget/src/main/kotlin/NuGet.kt
index 712eacc3662a5..7fd5bc709f1ba 100644
--- a/plugins/package-managers/nuget/src/main/kotlin/NuGet.kt
+++ b/plugins/package-managers/nuget/src/main/kotlin/NuGet.kt
@@ -41,7 +41,7 @@ class NuGet(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "NuGet", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "NuGetProject", analysisRoot, analyzerConfig, repoConfig) {
     companion object {
         const val OPTION_NUGET_CONFIG = "nugetConfigFile"
     }
diff --git a/plugins/package-managers/pub/src/funTest/assets/projects/external/dart-http-expected-output.yml b/plugins/package-managers/pub/src/funTest/assets/projects/external/dart-http-expected-output.yml
index 284bdadd896d5..527f79965f54f 100644
--- a/plugins/package-managers/pub/src/funTest/assets/projects/external/dart-http-expected-output.yml
+++ b/plugins/package-managers/pub/src/funTest/assets/projects/external/dart-http-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Pub::http:0.13.0"
+  id: "PubProject::http:0.13.0"
   definition_file_path: "pubspec.yaml"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-any-version.yml b/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-any-version.yml
index 72d9fb95ec5b2..11c05ac403dcb 100644
--- a/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-any-version.yml
+++ b/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-any-version.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Pub::version_any:0.1.0"
+  id: "PubProject::version_any:0.1.0"
   definition_file_path: "plugins/package-managers/pub/src/funTest/assets/projects/synthetic/any-version/pubspec.yaml"
   authors:
   - "Another Author"
diff --git a/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-multi-module.yml b/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-multi-module.yml
index 2ae94ce3dc882..5ca0c3451b733 100644
--- a/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-multi-module.yml
+++ b/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-multi-module.yml
@@ -1,6 +1,6 @@
 ---
 projects:
-- id: "Pub::multimodule:1.0.0"
+- id: "PubProject::multimodule:1.0.0"
   definition_file_path: "plugins/package-managers/pub/src/funTest/assets/projects/synthetic/multi-module/pubspec.yaml"
   authors:
   - "The ORT Project Authors"
@@ -20,12 +20,12 @@ projects:
   scopes:
   - name: "dependencies"
     dependencies:
-    - id: "Pub::subproject:1.0.0"
+    - id: "PubProject::subproject:1.0.0"
       dependencies:
       - id: "Pub::typed_data:1.3.1"
         dependencies:
         - id: "Pub::collection:1.16.0"
-- id: "Pub::subproject:1.0.0"
+- id: "PubProject::subproject:1.0.0"
   definition_file_path: "plugins/package-managers/pub/src/funTest/assets/projects/synthetic/multi-module/subproject/pubspec.yaml"
   authors:
   - "The ORT Project Authors"
diff --git a/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-with-flutter-android-and-cocoapods.yml b/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-with-flutter-android-and-cocoapods.yml
index 4f5bfc6f0f36a..6744908a0bac3 100644
--- a/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-with-flutter-android-and-cocoapods.yml
+++ b/plugins/package-managers/pub/src/funTest/assets/projects/synthetic/pub-expected-output-with-flutter-android-and-cocoapods.yml
@@ -1,6 +1,6 @@
 ---
 projects:
-- id: "Pub::flutter_example:1.0.0+1"
+- id: "PubProject::flutter_example:1.0.0+1"
   definition_file_path: "plugins/package-managers/pub/src/funTest/assets/projects/synthetic/flutter-project-with-android-and-cocoapods/pubspec.yaml"
   declared_licenses: []
   declared_licenses_processed: {}
@@ -18,9 +18,9 @@ projects:
   scopes:
   - name: "android"
     dependencies:
-    - id: "Gradle::android:"
+    - id: "GradleProject::android:"
       linkage: "PROJECT_STATIC"
-    - id: "Gradle:android:app:"
+    - id: "GradleProject:android:app:"
       linkage: "PROJECT_STATIC"
       dependencies:
       - id: "Maven:io.flutter:arm64_v8a_release:1.0.0-2e4ba9c6fb499ccd4e81420543783cc7267ae406"
diff --git a/plugins/package-managers/pub/src/main/kotlin/Pub.kt b/plugins/package-managers/pub/src/main/kotlin/Pub.kt
index e803d53ab03a2..635fff9788716 100644
--- a/plugins/package-managers/pub/src/main/kotlin/Pub.kt
+++ b/plugins/package-managers/pub/src/main/kotlin/Pub.kt
@@ -57,6 +57,7 @@ import org.ossreviewtoolkit.plugins.packagemanagers.pub.model.PackageInfo
 import org.ossreviewtoolkit.plugins.packagemanagers.pub.model.Pubspec
 import org.ossreviewtoolkit.plugins.packagemanagers.pub.model.Pubspec.Dependency
 import org.ossreviewtoolkit.plugins.packagemanagers.pub.model.Pubspec.SdkDependency
+import org.ossreviewtoolkit.plugins.packagemanagers.pub.model.isProject
 import org.ossreviewtoolkit.plugins.packagemanagers.pub.model.parseLockfile
 import org.ossreviewtoolkit.plugins.packagemanagers.pub.model.parsePubspec
 import org.ossreviewtoolkit.utils.common.CommandLineTool
@@ -107,7 +108,7 @@ class Pub(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Pub", analysisRoot, analyzerConfig, repoConfig), CommandLineTool {
+) : PackageManager(name, "PubProject", analysisRoot, analyzerConfig, repoConfig), CommandLineTool {
     companion object {
         const val OPTION_FLUTTER_VERSION = "flutterVersion"
         const val OPTION_GRADLE_VERSION = "gradleVersion"
@@ -378,13 +379,13 @@ class Pub(
             if (pkgInfoFromLockfile == null || pkgInfoFromLockfile.source == "sdk") return@forEach
 
             val id = Identifier(
-                type = "Pub",
+                type = if (pkgInfoFromLockfile.isProject) projectType else "Pub",
                 namespace = "",
                 name = packageName,
                 version = pkgInfoFromLockfile.version.orEmpty()
             )
 
-            val packageInfo = packages[id] ?: throw IOException("Could not find package info for $packageName")
+            val packageInfo = requireNotNull(packages[id]) { "Could not find any info for package '$packageName'." }
 
             try {
                 val dependencyPubspec = readPackageInfoFromCache(pkgInfoFromLockfile, workingDir)
@@ -629,7 +630,7 @@ class Pub(
                 }
 
                 val id = Identifier(
-                    type = "Pub",
+                    type = if (packageInfo.isProject) projectType else "Pub",
                     namespace = "",
                     name = rawName,
                     version = version
diff --git a/plugins/package-managers/pub/src/main/kotlin/model/Lockfile.kt b/plugins/package-managers/pub/src/main/kotlin/model/Lockfile.kt
index 75c0790626813..563fcbd521de5 100644
--- a/plugins/package-managers/pub/src/main/kotlin/model/Lockfile.kt
+++ b/plugins/package-managers/pub/src/main/kotlin/model/Lockfile.kt
@@ -72,6 +72,9 @@ internal data class PackageInfo(
     )
 }
 
+internal val PackageInfo.isProject: Boolean
+    get() = source == "path" && description.url == null
+
 private object DescriptionDeserializer : KSerializer<Description> by Description.generatedSerializer() {
     @OptIn(InternalSerializationApi::class)
     override val descriptor: SerialDescriptor by lazy {
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/external/example-python-flask-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/external/example-python-flask-expected-output.yml
index f9ba4d790fddf..de0c87753bcac 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/external/example-python-flask-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/external/example-python-flask-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PIP::example-python-flask:0773991e36a4c69b121cdb05146d6140347d4065"
+  id: "PIPProject::example-python-flask:0773991e36a4c69b121cdb05146d6140347d4065"
   definition_file_path: "requirements.txt"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/external/spdx-tools-python-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/external/spdx-tools-python-expected-output.yml
index 6e20f479f5c80..7112874ec0fa8 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/external/spdx-tools-python-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/external/spdx-tools-python-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PIP::spdx-tools:0.5.4"
+  id: "PIPProject::spdx-tools:0.5.4"
   definition_file_path: "setup.py"
   authors:
   - "Ahmed H. Ismail <ahm3d.hisham@gmail.com>"
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-expected-output.yml
index 081c53fdbc769..6f9506230ae31 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PIP::Example-App-with-requirements-pip:2.4.0"
+  id: "PIPProject::Example-App-with-requirements-pip:2.4.0"
   definition_file_path: "plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip/requirements.txt"
   declared_licenses:
   - "MIT License"
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-python3-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-python3-expected-output.yml
index 754cd81ee83a7..883950581502b 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-python3-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-python3-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PIP::pip-python3:<REPLACE_REVISION>"
+  id: "PIPProject::pip-python3:<REPLACE_REVISION>"
   definition_file_path: "plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-python3/requirements.txt"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-expected-output.yml
index aab5cb5cd1936..e8c987aa6c45b 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Pipenv::pipenv-from-pipenv:<REPLACE_REVISION>"
+  id: "PipenvProject::pipenv-from-pipenv:<REPLACE_REVISION>"
   definition_file_path: "plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv/requirements-from-pipenv.txt"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-python3-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-python3-expected-output.yml
index 571dd63720fd8..a699648795b2c 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-python3-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-python3-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Pipenv::pipenv-python3-from-pipenv:<REPLACE_REVISION>"
+  id: "PipenvProject::pipenv-python3-from-pipenv:<REPLACE_REVISION>"
   definition_file_path: "plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-python3/requirements-from-pipenv.txt"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-expected-output.yml
index a40d9fe54602b..ee8bbae42fb23 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Poetry::src/funTest/assets/projects/synthetic/poetry/poetry.lock:<REPLACE_REVISION>"
+  id: "PoetryProject::src/funTest/assets/projects/synthetic/poetry/poetry.lock:<REPLACE_REVISION>"
   definition_file_path: "plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry/poetry.lock"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-no-dev-group-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-no-dev-group-expected-output.yml
index 46d1273a4c85b..723ff9c359e18 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-no-dev-group-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-no-dev-group-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Poetry::src/funTest/assets/projects/synthetic/poetry-no-dev-group/poetry.lock:<REPLACE_REVISION>"
+  id: "PoetryProject::src/funTest/assets/projects/synthetic/poetry-no-dev-group/poetry.lock:<REPLACE_REVISION>"
   definition_file_path: "plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-no-dev-group/poetry.lock"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/python-inspector-expected-output.yml b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/python-inspector-expected-output.yml
index b8679cab0f3c0..068aa6add7a0a 100644
--- a/plugins/package-managers/python/src/funTest/assets/projects/synthetic/python-inspector-expected-output.yml
+++ b/plugins/package-managers/python/src/funTest/assets/projects/synthetic/python-inspector-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PIP::python-inspector:<REPLACE_REVISION>"
+  id: "PIPProject::python-inspector:<REPLACE_REVISION>"
   definition_file_path: "plugins/package-managers/python/src/funTest/assets/projects/synthetic/python-inspector/requirements.txt"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/python/src/main/kotlin/Pip.kt b/plugins/package-managers/python/src/main/kotlin/Pip.kt
index 8eea22179f143..12e1eac03d0d4 100644
--- a/plugins/package-managers/python/src/main/kotlin/Pip.kt
+++ b/plugins/package-managers/python/src/main/kotlin/Pip.kt
@@ -63,7 +63,7 @@ class Pip(
     repoConfig: RepositoryConfiguration
 ) : PackageManager(
     name,
-    analyzerConfig.getPackageManagerConfiguration(name)?.options?.get("overrideProjectType") ?: "PIP",
+    analyzerConfig.getPackageManagerConfiguration(name)?.options?.get("overrideProjectType") ?: "PIPProject",
     analysisRoot,
     analyzerConfig,
     repoConfig
diff --git a/plugins/package-managers/python/src/main/kotlin/Pipenv.kt b/plugins/package-managers/python/src/main/kotlin/Pipenv.kt
index 0cc4f96056de3..6479509500e49 100644
--- a/plugins/package-managers/python/src/main/kotlin/Pipenv.kt
+++ b/plugins/package-managers/python/src/main/kotlin/Pipenv.kt
@@ -55,7 +55,7 @@ class Pipenv(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Pipenv", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "PipenvProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Pipenv>("Pipenv") {
         override val globsForDefinitionFiles = listOf("Pipfile.lock")
 
diff --git a/plugins/package-managers/python/src/main/kotlin/Poetry.kt b/plugins/package-managers/python/src/main/kotlin/Poetry.kt
index 449ff04fac227..d15ab7aa91d3c 100644
--- a/plugins/package-managers/python/src/main/kotlin/Poetry.kt
+++ b/plugins/package-managers/python/src/main/kotlin/Poetry.kt
@@ -58,7 +58,7 @@ class Poetry(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Poetry", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "PoetryProject", analysisRoot, analyzerConfig, repoConfig) {
     companion object {
         /**
          * The name of the build system requirements and information file used by modern Python packages.
diff --git a/plugins/package-managers/sbt/src/funTest/assets/projects/external/sbt-multi-project-example-expected-output.yml b/plugins/package-managers/sbt/src/funTest/assets/projects/external/sbt-multi-project-example-expected-output.yml
index 8f1247865b25e..1b5b29b5fae74 100644
--- a/plugins/package-managers/sbt/src/funTest/assets/projects/external/sbt-multi-project-example-expected-output.yml
+++ b/plugins/package-managers/sbt/src/funTest/assets/projects/external/sbt-multi-project-example-expected-output.yml
@@ -32,7 +32,7 @@ analyzer:
     skip_excluded: false
   result:
     projects:
-    - id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "common/target-scala-2.12-common_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -85,7 +85,7 @@ analyzer:
           - id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
           - id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
           - id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
-    - id: "SBT:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi1_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "multi1/target-scala-2.12-multi1_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -134,7 +134,7 @@ analyzer:
             - id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
         - id: "Maven:org.scala-lang:scala-library:2.12.15"
         - id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
-        - id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+        - id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
           linkage: "PROJECT_DYNAMIC"
       - name: "test"
         dependencies:
@@ -146,7 +146,7 @@ analyzer:
           - id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
           - id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
           - id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
-    - id: "SBT:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:multi2_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "multi2/target-scala-2.12-multi2_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
@@ -196,7 +196,7 @@ analyzer:
             - id: "Maven:com.fasterxml.jackson.core:jackson-core:2.8.9"
         - id: "Maven:org.scala-lang:scala-library:2.12.15"
         - id: "Maven:org.slf4j:jcl-over-slf4j:1.7.25"
-        - id: "SBT:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
+        - id: "SBTProject:com.pbassiner:common_2.12:0.1.0-SNAPSHOT"
           linkage: "PROJECT_DYNAMIC"
       - name: "test"
         dependencies:
@@ -208,7 +208,7 @@ analyzer:
           - id: "Maven:org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4"
           - id: "Maven:org.scala-lang.modules:scala-xml_2.12:1.0.5"
           - id: "Maven:org.scalactic:scalactic_2.12:3.0.4"
-    - id: "SBT:com.pbassiner:sbt-multi-project-example_2.12:0.1.0-SNAPSHOT"
+    - id: "SBTProject:com.pbassiner:sbt-multi-project-example_2.12:0.1.0-SNAPSHOT"
       definition_file_path: "target-scala-2.12-sbt-multi-project-example_2.12-0.1.0-SNAPSHOT.pom"
       authors:
       - "com.pbassiner"
diff --git a/plugins/package-managers/sbt/src/funTest/assets/projects/synthetic/sbt-http4s-template-expected-output.yml b/plugins/package-managers/sbt/src/funTest/assets/projects/synthetic/sbt-http4s-template-expected-output.yml
index c511d736bd057..d7f0c9d67d8f4 100644
--- a/plugins/package-managers/sbt/src/funTest/assets/projects/synthetic/sbt-http4s-template-expected-output.yml
+++ b/plugins/package-managers/sbt/src/funTest/assets/projects/synthetic/sbt-http4s-template-expected-output.yml
@@ -32,7 +32,7 @@ analyzer:
     skip_excluded: false
   result:
     projects:
-    - id: "SBT:com.example:http4s-template_2.13:0.0.1-SNAPSHOT"
+    - id: "SBTProject:com.example:http4s-template_2.13:0.0.1-SNAPSHOT"
       definition_file_path: "plugins/package-managers/sbt/src/funTest/assets/projects/synthetic/sbt-http4s-template/target-scala-2.13-http4s-template_2.13-0.0.1-SNAPSHOT.pom"
       authors:
       - "com.example"
diff --git a/plugins/package-managers/sbt/src/main/kotlin/Sbt.kt b/plugins/package-managers/sbt/src/main/kotlin/Sbt.kt
index 119bc65ca0f70..2eee4baeeb193 100644
--- a/plugins/package-managers/sbt/src/main/kotlin/Sbt.kt
+++ b/plugins/package-managers/sbt/src/main/kotlin/Sbt.kt
@@ -86,7 +86,7 @@ class Sbt(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "SBT", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "SBTProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Sbt>("SBT") {
         override val globsForDefinitionFiles = listOf("build.sbt", "build.scala")
 
diff --git a/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-cyclic-expected-output.yml b/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-cyclic-expected-output.yml
index 575c0811f831f..3c9404fc22490 100644
--- a/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-cyclic-expected-output.yml
+++ b/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-cyclic-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SpdxDocument::xyz:0.1.0"
+  id: "SpdxDocumentProject::xyz:0.1.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "Thomas Steenbergen"
diff --git a/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-xyz-expected-output-subproject-conan.yml b/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-xyz-expected-output-subproject-conan.yml
index 69c16d83b74ee..2c5c50d1f687e 100644
--- a/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-xyz-expected-output-subproject-conan.yml
+++ b/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-xyz-expected-output-subproject-conan.yml
@@ -1,6 +1,6 @@
 ---
 projects:
-- id: "Conan::ConanProject:1.0.0"
+- id: "ConanProject::ConanProject:1.0.0"
   definition_file_path: "plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/subproject-conan/subproject/conanfile.py"
   authors:
   - "The ORT Project Authors"
@@ -26,7 +26,7 @@ projects:
     - id: "Conan::openssl:3.0.0"
       dependencies:
       - id: "Conan::zlib:1.2.12"
-- id: "SpdxDocument::xyz:0.1.0"
+- id: "SpdxDocumentProject::xyz:0.1.0"
   definition_file_path: "plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/subproject-conan/project-xyz.spdx.yml"
   authors:
   - "Thomas Steenbergen"
diff --git a/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-xyz-expected-output.yml b/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-xyz-expected-output.yml
index 6a8f8c41e8d00..7075a07ef2124 100644
--- a/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-xyz-expected-output.yml
+++ b/plugins/package-managers/spdx/src/funTest/assets/projects/synthetic/spdx-project-xyz-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SpdxDocument::xyz:0.1.0"
+  id: "SpdxDocumentProject::xyz:0.1.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   authors:
   - "Thomas Steenbergen"
diff --git a/plugins/package-managers/spdx/src/main/kotlin/SpdxDocumentFile.kt b/plugins/package-managers/spdx/src/main/kotlin/SpdxDocumentFile.kt
index ab749b5c99f40..54bd77db4d94f 100644
--- a/plugins/package-managers/spdx/src/main/kotlin/SpdxDocumentFile.kt
+++ b/plugins/package-managers/spdx/src/main/kotlin/SpdxDocumentFile.kt
@@ -259,7 +259,7 @@ class SpdxDocumentFile(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(managerName, "SpdxDocument", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(managerName, "SpdxDocumentProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<SpdxDocumentFile>("SpdxDocumentFile") {
         override val globsForDefinitionFiles = listOf("*.spdx.yml", "*.spdx.yaml", "*.spdx.json")
 
diff --git a/plugins/package-managers/stack/src/funTest/assets/projects/external/quickcheck-state-machine-expected-output.yml b/plugins/package-managers/stack/src/funTest/assets/projects/external/quickcheck-state-machine-expected-output.yml
index 2fce67f9bafc7..b4960e0c0e1be 100644
--- a/plugins/package-managers/stack/src/funTest/assets/projects/external/quickcheck-state-machine-expected-output.yml
+++ b/plugins/package-managers/stack/src/funTest/assets/projects/external/quickcheck-state-machine-expected-output.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "Stack:Testing:quickcheck-state-machine:0.6.0"
+  id: "StackProject:Testing:quickcheck-state-machine:0.6.0"
   definition_file_path: "stack.yaml"
   authors:
   - "Stevan Andjelkovic"
diff --git a/plugins/package-managers/stack/src/main/kotlin/Stack.kt b/plugins/package-managers/stack/src/main/kotlin/Stack.kt
index 5ca14c1cca60f..2eaf40b3eb24d 100644
--- a/plugins/package-managers/stack/src/main/kotlin/Stack.kt
+++ b/plugins/package-managers/stack/src/main/kotlin/Stack.kt
@@ -82,7 +82,7 @@ class Stack(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Stack", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "StackProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Stack>("Stack") {
         override val globsForDefinitionFiles = listOf("stack.yaml")
 
diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml
index ebbfed4fc3812..18a53f0e58b0c 100644
--- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml
+++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SwiftPM::src/funTest/assets/projects/synthetic/only-lockfile-v1/Package.resolved:<REPLACE_REVISION>"
+  id: "SwiftPMProject::src/funTest/assets/projects/synthetic/only-lockfile-v1/Package.resolved:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v2.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v2.yml
index f78abee330780..3be99e4b718d7 100644
--- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v2.yml
+++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v2.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SwiftPM::src/funTest/assets/projects/synthetic/only-lockfile-v2/Package.resolved:<REPLACE_REVISION>"
+  id: "SwiftPMProject::src/funTest/assets/projects/synthetic/only-lockfile-v2/Package.resolved:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v3.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v3.yml
index a6fc01909ab36..7134c6901fc38 100644
--- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v3.yml
+++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v3.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SwiftPM::src/funTest/assets/projects/synthetic/only-lockfile-v3/Package.resolved:<REPLACE_REVISION>"
+  id: "SwiftPMProject::src/funTest/assets/projects/synthetic/only-lockfile-v3/Package.resolved:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v4.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v4.yml
index b7630f1ffba65..fd2f3bd92b2c8 100644
--- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v4.yml
+++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v4.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SwiftPM::src/funTest/assets/projects/synthetic/only-lockfile-v4/Package.resolved:<REPLACE_REVISION>"
+  id: "SwiftPMProject::src/funTest/assets/projects/synthetic/only-lockfile-v4/Package.resolved:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-with-lockfile.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-with-lockfile.yml
index a99484d8780eb..948b0c0ea9307 100644
--- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-with-lockfile.yml
+++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-with-lockfile.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SwiftPM::src/funTest/assets/projects/synthetic/project-with-lockfile/Package.swift:<REPLACE_REVISION>"
+  id: "SwiftPMProject::src/funTest/assets/projects/synthetic/project-with-lockfile/Package.swift:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-without-deps.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-without-deps.yml
index 7bebe95325ef5..0798a4df2e193 100644
--- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-without-deps.yml
+++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-without-deps.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SwiftPM::src/funTest/assets/projects/synthetic/project-without-deps/Package.swift:<REPLACE_REVISION>"
+  id: "SwiftPMProject::src/funTest/assets/projects/synthetic/project-without-deps/Package.swift:<REPLACE_REVISION>"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-without-lockfile.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-without-lockfile.yml
index 037a0c044ca25..b57dda51880f8 100644
--- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-without-lockfile.yml
+++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-without-lockfile.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "SwiftPM::src/funTest/assets/projects/synthetic/project-without-lockfile/Package.swift:"
+  id: "SwiftPMProject::src/funTest/assets/projects/synthetic/project-without-lockfile/Package.swift:"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses: []
   declared_licenses_processed: {}
diff --git a/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt b/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt
index f916493d8701c..c55c4d93163b5 100644
--- a/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt
+++ b/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt
@@ -65,7 +65,7 @@ class SwiftPm(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "SwiftPM", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "SwiftPMProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<SwiftPm>("SwiftPM") {
         override val globsForDefinitionFiles = listOf(PACKAGE_SWIFT_NAME, PACKAGE_RESOLVED_NAME)
 
diff --git a/plugins/package-managers/unmanaged/src/main/kotlin/Unmanaged.kt b/plugins/package-managers/unmanaged/src/main/kotlin/Unmanaged.kt
index c43b17da53a54..b2a50c19cf205 100644
--- a/plugins/package-managers/unmanaged/src/main/kotlin/Unmanaged.kt
+++ b/plugins/package-managers/unmanaged/src/main/kotlin/Unmanaged.kt
@@ -45,7 +45,7 @@ class Unmanaged(
     analysisRoot: File,
     analyzerConfig: AnalyzerConfiguration,
     repoConfig: RepositoryConfiguration
-) : PackageManager(name, "Unmanaged", analysisRoot, analyzerConfig, repoConfig) {
+) : PackageManager(name, "UnmanagedProject", analysisRoot, analyzerConfig, repoConfig) {
     class Factory : AbstractPackageManagerFactory<Unmanaged>("Unmanaged") {
         // The empty list returned here deliberately causes this special package manager to never be considered in
         // PackageManager.findManagedFiles(). Instead, it will only be explicitly instantiated as part of
diff --git a/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-analyzer-and-scanner-result.yml b/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-analyzer-and-scanner-result.yml
index 741ad08e09d82..7243e06488316 100644
--- a/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-analyzer-and-scanner-result.yml
+++ b/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-analyzer-and-scanner-result.yml
@@ -50,7 +50,7 @@ analyzer:
     skip_excluded: true
   result:
     projects:
-    - id: "GoMod::github.com/mercedes-benz/disclosure-cli:388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
+    - id: "GoModProject::github.com/mercedes-benz/disclosure-cli:388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
       definition_file_path: "go.mod"
       declared_licenses: []
       declared_licenses_processed: {}
@@ -483,7 +483,7 @@ scanner:
         revision: "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
         path: ""
       resolved_revision: "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
-  - id: "GoMod::github.com/mercedes-benz/disclosure-cli:388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
+  - id: "GoModProject::github.com/mercedes-benz/disclosure-cli:388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
     package_provenance:
       vcs_info:
         type: "Git"
@@ -2911,7 +2911,7 @@ scanner:
     - "ScanCode"
     Go::gopkg.in/yaml.v3:3.0.1:
     - "ScanCode"
-    GoMod::github.com/mercedes-benz/disclosure-cli:388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d:
+    GoModProject::github.com/mercedes-benz/disclosure-cli:388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d:
     - "ScanCode"
   files: []
 advisor: null
diff --git a/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-expected-output.spdx.yml b/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-expected-output.spdx.yml
index 4a8fdea23a306..f1e2b13de8d75 100644
--- a/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-expected-output.spdx.yml
+++ b/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-expected-output.spdx.yml
@@ -14,9 +14,9 @@ dataLicense: "CC0-1.0"
 comment: "some document comment"
 documentNamespace: "<REPLACE_DOCUMENT_NAMESPACE>"
 documentDescribes:
-- "SPDXRef-Project-GoMod-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
+- "SPDXRef-Project-GoModProject-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
 packages:
-- SPDXID: "SPDXRef-Project-GoMod-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
+- SPDXID: "SPDXRef-Project-GoModProject-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
   copyrightText: "(c) Copyright 2010 The Go Authors\n(c) Copyright 2010-2013 (c) Gustavo\
     \ Niemeyer <gustavo@niemeyer.net>\n(c) Copyright 2012-2016 (c) Dave Collins <dave@davec.name>\n\
     (c) Copyright 2012-2020 (c) Mat Ryer, Tyler Bunnell and contributors\n(c) Copyright\
@@ -327,12 +327,12 @@ relationships:
 - spdxElementId: "SPDXRef-Package-Go-gopkg.in.yaml.v3-3.0.1"
   relationshipType: "GENERATED_FROM"
   relatedSpdxElement: "SPDXRef-Package-Go-gopkg.in.yaml.v3-3.0.1-vcs"
-- spdxElementId: "SPDXRef-Project-GoMod-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
+- spdxElementId: "SPDXRef-Project-GoModProject-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
   relationshipType: "DEPENDS_ON"
   relatedSpdxElement: "SPDXRef-Package-Go-github.com.jinzhu.configor-1.2.2"
-- spdxElementId: "SPDXRef-Project-GoMod-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
+- spdxElementId: "SPDXRef-Project-GoModProject-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
   relationshipType: "DEPENDS_ON"
   relatedSpdxElement: "SPDXRef-Package-Go-github.com.spf13.cobra-1.8.1"
-- spdxElementId: "SPDXRef-Project-GoMod-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
+- spdxElementId: "SPDXRef-Project-GoModProject-github.com.mercedes-benz.disclosure-cli-388ae2bdf6032a3d5b0ed06ac45267dfc0376a3d"
   relationshipType: "DEPENDS_ON"
   relatedSpdxElement: "SPDXRef-Package-Go-github.com.stretchr.testify-1.8.2"