diff --git a/docs/reference/dagger/README.md b/docs/reference/dagger/README.md
index 8bd33ae0..78a571c5 100644
--- a/docs/reference/dagger/README.md
+++ b/docs/reference/dagger/README.md
@@ -22,14 +22,14 @@ _No input._
 
 _No output._
 
-## dagger.#Socket
+## dagger.#Stream
 
-Dagger socket. Can be mounted as a UNIX socket.
+Dagger stream. Can be mounted as a UNIX socket.
 
-### dagger.#Socket Inputs
+### dagger.#Stream Inputs
 
 _No input._
 
-### dagger.#Socket Outputs
+### dagger.#Stream Outputs
 
 _No output._
diff --git a/environment/pipeline.go b/environment/pipeline.go
index 79bd276f..21b4ab87 100644
--- a/environment/pipeline.go
+++ b/environment/pipeline.go
@@ -506,15 +506,15 @@ func (p *Pipeline) mount(ctx context.Context, dest string, mnt *compiler.Value)
 		), nil
 	}
 
-	// eg. mount: "/var/run/docker.sock": socket: mysocket
-	if socket := mnt.Lookup("socket"); socket.Exists() {
-		if !socket.HasAttr("socket") {
-			return nil, fmt.Errorf("invalid socket %q: not a socket", socket.Path().String())
+	// eg. mount: "/var/run/docker.sock": stream: mystream
+	if stream := mnt.Lookup("stream"); stream.Exists() {
+		if !stream.HasAttr("stream") {
+			return nil, fmt.Errorf("invalid stream %q: not a stream", stream.Path().String())
 		}
 
-		unixValue := socket.Lookup("unix")
+		unixValue := stream.Lookup("unix")
 		if !unixValue.Exists() {
-			return nil, fmt.Errorf("invalid socket %q: not a unix socket", socket.Path().String())
+			return nil, fmt.Errorf("invalid stream %q: not a unix socket", stream.Path().String())
 		}
 
 		unix, err := unixValue.String()
diff --git a/stdlib/dagger/dagger.cue b/stdlib/dagger/dagger.cue
index bf08e6e9..35da3ce6 100644
--- a/stdlib/dagger/dagger.cue
+++ b/stdlib/dagger/dagger.cue
@@ -14,9 +14,9 @@ import (
 	...
 }
 
-// Dagger socket. Can be mounted as a UNIX socket.
-#Socket: {
-	@dagger(socket)
+// Dagger stream. Can be mounted as a UNIX socket.
+#Stream: {
+	@dagger(stream)
 
 	unix: string
 }
diff --git a/tests/core.bats b/tests/core.bats
index 57ec21a5..6a46f595 100644
--- a/tests/core.bats
+++ b/tests/core.bats
@@ -148,10 +148,10 @@ setup() {
     assert_output --partial "secret=mySecret;hash="
 }
 
-@test "core: socket" {
+@test "core: stream" {
     dagger init
 
-    dagger_new_with_plan test-socket "$TESTDIR"/core/socket
+    dagger_new_with_plan test-stream "$TESTDIR"/core/stream
 
     # Set dir input
     "$DAGGER" input socket dockersocket /var/run/docker.sock
diff --git a/tests/core/socket/main.cue b/tests/core/stream/main.cue
similarity index 73%
rename from tests/core/socket/main.cue
rename to tests/core/stream/main.cue
index 5bd4ef1e..dc77480a 100644
--- a/tests/core/socket/main.cue
+++ b/tests/core/stream/main.cue
@@ -6,7 +6,7 @@ import (
 	"alpha.dagger.io/alpine"
 )
 
-dockersocket: dagger.#Socket & dagger.#Input
+dockersocket: dagger.#Stream & dagger.#Input
 
 TestDockerSocket: #up: [
 	op.#Load & {
@@ -17,7 +17,7 @@ TestDockerSocket: #up: [
 
 	op.#Exec & {
 		always: true
-		mount: "/var/run/docker.sock": socket: dockersocket
+		mount: "/var/run/docker.sock": stream: dockersocket
 		args: ["docker", "info"]
 	},
 ]