diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 3453dfe0..27fff7d7 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 19
+          java-version: 21
       - uses: actions/cache@v2
         with:
           path: |
@@ -20,9 +20,3 @@ jobs:
           key: ${{ runner.os }}-sbt-${{ hashfiles('**/build.sbt') }}
       - name: scalafmtCheck and tests
         run: sbt scalafmtCheck Test/scalafmtCheck test
-      - name: Generate domain classes and verify everything is committed
-        run: |
-          ./generateDomainClasses.sh
-          UNTRACKED_FILES=$(git status --porcelain 2>/dev/null| grep "^??" | wc -l)
-          echo $UNTRACKED_FILES untracked files
-          exit $UNTRACKED_FILES
diff --git a/build.sbt b/build.sbt
index 756a37ff..0aec5b52 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,6 @@
 name := "flatgraph"
-ThisBuild / organization := "io.joern.flatgraph"
+ThisBuild / organization := "io.joern"
 ThisBuild / scalaVersion := scala3
-publish / skip := true
 
 val slf4jVersion = "2.0.7"
 val scala3 = "3.3.1"
@@ -22,7 +21,7 @@ lazy val root = (project in file(".")).aggregate(
 lazy val core = project
   .in(file("core"))
   .settings(
-    name := "core",
+    name := "flatgraph-core",
     libraryDependencies ++= Seq(
       "com.lihaoyi"     %% "upickle"  % "3.1.3",
       "com.github.luben" % "zstd-jni" % "1.5.0-4",
@@ -38,7 +37,7 @@ lazy val formats = project
   .in(file("formats"))
   .dependsOn(core)
   .settings(
-    name := "formats",
+    name := "flatgraph-formats",
     libraryDependencies ++= Seq(
       "com.github.tototoshi" %% "scala-csv" % "1.3.10",
       "org.scala-lang.modules" %% "scala-xml" % "2.1.0",
@@ -51,7 +50,7 @@ lazy val formats = project
 lazy val domainClassesGenerator_3 = project
   .in(file("domain-classes-generator_3"))
   .settings(
-    name := "domain-classes-generator",
+    name := "flatgraph-domain-classes-generator",
     sourceDirectory := baseDirectory.value / "../domain-classes-generator/src",
     libraryDependencies ++= Seq(
       "org.slf4j" % "slf4j-simple" % slf4jVersion % Optional,
@@ -65,7 +64,7 @@ lazy val domainClassesGenerator_3 = project
 lazy val domainClassesGenerator_2_12 = project
   .in(file("domain-classes-generator_2.12"))
   .settings(
-    name := "domain-classes-generator",
+    name := "flatgraph-domain-classes-generator",
     sourceDirectory := baseDirectory.value / "../domain-classes-generator/src",
     scalaVersion := scala2_12,
     scalacOptions := scalacOptionsFor2_12,
@@ -94,32 +93,13 @@ lazy val odbConvert = project
   .dependsOn(core)
   .enablePlugins(JavaAppPackaging)
   .settings(
-    name := "odb-convert",
+    name := "flatgraph-odb-convert",
     libraryDependencies ++= Seq(
       "io.shiftleft" %% "overflowdb-core" % "1.181",
       "org.slf4j" % "slf4j-simple" % slf4jVersion % Optional
     )
   )
 
-
-/** temporarily we still want to keep the generated files for the cpg domain in here,
-  * in order to be able to quickly see the differences in the generated files if we
-  * change the codegen
-  * n.b. relies on a manually published version of cpg-schema based on the `michael/flatgraph` branch
-  *
-  * https://github.com/ShiftLeftSecurity/overflowdbv2/pull/137#pullrequestreview-1761992014
-  */
-lazy val domainClassesGeneratorJoern = project
-  .in(file("domain-classes-generator-joern"))
-  .dependsOn(domainClassesGenerator_2_12)
-  .settings(
-    name := "domain-classes-generator-joern",
-    scalaVersion := scala2_12,
-    scalacOptions := scalacOptionsFor2_12,
-    publish / skip := true,
-    libraryDependencies += "com.michaelpollmeier" %% "codepropertygraph-schema" % "1.4.32+25-1e56e611"
-  )
-
 lazy val joernGenerated = project
   .in(file("joern-generated"))
   .dependsOn(core)
@@ -165,7 +145,6 @@ val scalacOptionsFor2_12 = Seq(
   "-language:implicitConversions"
 )
 
-
 ThisBuild / compile / javacOptions ++= Seq(
   "-g", // debug symbols
   "--release=8"
@@ -186,3 +165,5 @@ ThisBuild / developers := List(
   Developer("bbrehm", "Bernhard Brehm", "bernhard@shiftleft.io", url("https://github.com/bbrehm")),
   Developer("mpollmeier", "Michael Pollmeier", "michael@michaelpollmeier.com", url("http://www.michaelpollmeier.com"))
 )
+
+publish / skip := true // don't publish the root project