diff --git a/akka-samples/akka-sample-fsm-java-lambda/build.sbt b/akka-samples/akka-sample-fsm-java-lambda/build.sbt
index 41480d5482..f349245cb4 100644
--- a/akka-samples/akka-sample-fsm-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-fsm-java-lambda/build.sbt
@@ -1,4 +1,4 @@
-name := "akka-docs-java-lambda"
+name := "akka-sample-fsm-java-lambda"
 
 version := "2.4-SNAPSHOT"
 
diff --git a/akka-samples/akka-sample-supervision-java-lambda/build.sbt b/akka-samples/akka-sample-supervision-java-lambda/build.sbt
index fb4563bbac..ba7aa1258c 100644
--- a/akka-samples/akka-sample-supervision-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-supervision-java-lambda/build.sbt
@@ -1,4 +1,4 @@
-name := "akka-supervision-java-lambda"
+name := "akka-sample-supervision-java-lambda"
 
 version := "2.4-SNAPSHOT"
 
diff --git a/akka-samples/akka-sample-supervision-java-lambda/pom.xml b/akka-samples/akka-sample-supervision-java-lambda/pom.xml
index 0f69d0d122..7ab7e78a01 100644
--- a/akka-samples/akka-sample-supervision-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-supervision-java-lambda/pom.xml
@@ -9,7 +9,7 @@
   </properties>
 
   <groupId>sample</groupId>
-  <artifactId>akka-supervision-java-lambda</artifactId>
+  <artifactId>akka-sample-supervision-java-lambda</artifactId>
   <packaging>jar</packaging>
   <version>2.4-SNAPSHOT</version>
 
diff --git a/akka-stream-tests-tck/build.sbt b/akka-stream-tests-tck/build.sbt
index 497bb32918..ee0d80984a 100644
--- a/akka-stream-tests-tck/build.sbt
+++ b/akka-stream-tests-tck/build.sbt
@@ -1,7 +1,6 @@
 import akka._
-import com.typesafe.tools.mima.plugin.MimaKeys
 
 AkkaBuild.defaultSettings
-AkkaBuild.experimentalSettings
+AkkaBuild.dontPublishSettings
 Formatting.formatSettings
 Dependencies.streamTestsTck
diff --git a/akka-stream-tests/build.sbt b/akka-stream-tests/build.sbt
index a8ad627a33..4e6e0ee6fc 100644
--- a/akka-stream-tests/build.sbt
+++ b/akka-stream-tests/build.sbt
@@ -1,8 +1,6 @@
 import akka._
-import com.typesafe.tools.mima.plugin.MimaKeys
 
 AkkaBuild.defaultSettings
 AkkaBuild.dontPublishSettings
-AkkaBuild.experimentalSettings
 Formatting.formatSettings
 Dependencies.streamTests
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index eefcfc5e8e..84ecfb4f69 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -277,13 +277,13 @@ object AkkaBuild extends Build {
   )
 
   lazy val streamTests = Project(
-    id = "akka-stream-tests-experimental",
+    id = "akka-stream-tests",
     base = file("akka-stream-tests"),
     dependencies = Seq(streamTestkit % "test->test", stream)
   )
 
   lazy val streamTestsTck = Project(
-    id = "akka-stream-tests-tck-experimental",
+    id = "akka-stream-tests-tck",
     base = file("akka-stream-tests-tck"),
     dependencies = Seq(streamTestkit % "test->test", stream)
   )