diff --git a/.github/workflows/container-images.yml b/.github/workflows/container-images.yml
index db7db20..376f1af 100644
--- a/.github/workflows/container-images.yml
+++ b/.github/workflows/container-images.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         image:
-          - function-data-buffer
+          - function-data-buffer-fs
           - function-data-copy
           - function-data-discard
           - function-generic-noop
diff --git a/Makefile b/Makefile
index d08937a..93b1fc0 100644
--- a/Makefile
+++ b/Makefile
@@ -203,7 +203,7 @@ clean: ## Cleanup build output
 .PHONY: image
 image: $(addprefix image-, $(IMAGES)) ## Build all container images
 
-## image-function-data-buffer:                ## Build data-buffer function container image
+## image-function-data-buffer-fs:             ## Build data-buffer-fs function container image
 ## image-function-data-copy:                  ## Build data-copy function container image
 ## image-function-data-discard:               ## Build data-discard function container image
 ## image-function-generic-noop:               ## Build generic-noop function container image
diff --git a/build/package/image/function-data-buffer/Dockerfile.generic.generic b/build/package/image/function-data-buffer-fs/Dockerfile.generic.generic
similarity index 97%
rename from build/package/image/function-data-buffer/Dockerfile.generic.generic
rename to build/package/image/function-data-buffer-fs/Dockerfile.generic.generic
index bf60804..43953b4 100644
--- a/build/package/image/function-data-buffer/Dockerfile.generic.generic
+++ b/build/package/image/function-data-buffer-fs/Dockerfile.generic.generic
@@ -53,7 +53,7 @@ ARG TARGETOS \
 LABEL maintainer="Matthias Neugebauer <mtneug@shio.solutions>" \
       org.opencontainers.image.created="${BUILD_DATE}" \
       org.opencontainers.image.authors="Matthias Neugebauer <mtneug@shio.solutions>" \
-      org.opencontainers.image.url="ghcr.io/nagare-media/engine/function-data-buffer" \
+      org.opencontainers.image.url="ghcr.io/nagare-media/engine/function-data-buffer-fs" \
       org.opencontainers.image.documentation="https://nagare.media" \
       org.opencontainers.image.source="https://github.com/nagare-media/engine" \
       org.opencontainers.image.version="${VERSION}" \
@@ -65,7 +65,7 @@ LABEL maintainer="Matthias Neugebauer <mtneug@shio.solutions>" \
 
 WORKDIR /
 COPY --from=build "/app/bin/task-shim-${VERSION}-${TARGETOS}-${TARGETARCH}" /task-shim
-COPY --from=build "/app/bin/functions-${VERSION}-${TARGETOS}-${TARGETARCH}" /data-buffer
+COPY --from=build "/app/bin/functions-${VERSION}-${TARGETOS}-${TARGETARCH}" /data-buffer-fs
 USER 65532:65532
 
 COPY <<EOF /config/task-shim.yaml
@@ -82,7 +82,7 @@ task:
     - name: execute function
       action: task-shim.engine.nagare.media/exec
       config:
-        command: /data-buffer
+        command: /data-buffer-fs
         args: ["/tmp/nbmp.tdd"]
 EOF
 
diff --git a/build/package/image/function-data-buffer/Dockerfile.linux.amd64 b/build/package/image/function-data-buffer-fs/Dockerfile.linux.amd64
similarity index 100%
rename from build/package/image/function-data-buffer/Dockerfile.linux.amd64
rename to build/package/image/function-data-buffer-fs/Dockerfile.linux.amd64
diff --git a/build/package/image/function-data-buffer/Dockerfile.linux.arm b/build/package/image/function-data-buffer-fs/Dockerfile.linux.arm
similarity index 100%
rename from build/package/image/function-data-buffer/Dockerfile.linux.arm
rename to build/package/image/function-data-buffer-fs/Dockerfile.linux.arm
diff --git a/build/package/image/function-data-buffer/Dockerfile.linux.arm64 b/build/package/image/function-data-buffer-fs/Dockerfile.linux.arm64
similarity index 100%
rename from build/package/image/function-data-buffer/Dockerfile.linux.arm64
rename to build/package/image/function-data-buffer-fs/Dockerfile.linux.arm64
diff --git a/build/package/image/function-data-buffer/Dockerfile.linux.ppc64le b/build/package/image/function-data-buffer-fs/Dockerfile.linux.ppc64le
similarity index 100%
rename from build/package/image/function-data-buffer/Dockerfile.linux.ppc64le
rename to build/package/image/function-data-buffer-fs/Dockerfile.linux.ppc64le
diff --git a/build/package/image/function-data-buffer/Dockerfile.linux.s390x b/build/package/image/function-data-buffer-fs/Dockerfile.linux.s390x
similarity index 100%
rename from build/package/image/function-data-buffer/Dockerfile.linux.s390x
rename to build/package/image/function-data-buffer-fs/Dockerfile.linux.s390x
diff --git a/cmd/functions/main.go b/cmd/functions/main.go
index a2056e4..6e59fb6 100644
--- a/cmd/functions/main.go
+++ b/cmd/functions/main.go
@@ -27,7 +27,7 @@ import (
 	"github.com/nagare-media/engine/cmd/functions/cli"
 
 	// Import nagare media functions to be included in this multi-binary.
-	_ "github.com/nagare-media/engine/internal/functions/functions/data-buffer"
+	_ "github.com/nagare-media/engine/internal/functions/functions/data-buffer-fs"
 	_ "github.com/nagare-media/engine/internal/functions/functions/data-copy"
 	_ "github.com/nagare-media/engine/internal/functions/functions/data-discard"
 	_ "github.com/nagare-media/engine/internal/functions/functions/generic-noop"
diff --git a/config/samples/k8s/v1alpha1_engine.nagare.media_functions_data-buffer.yaml b/config/samples/k8s/v1alpha1_engine.nagare.media_functions_data-buffer-fs.yaml
similarity index 97%
rename from config/samples/k8s/v1alpha1_engine.nagare.media_functions_data-buffer.yaml
rename to config/samples/k8s/v1alpha1_engine.nagare.media_functions_data-buffer-fs.yaml
index 18afd6c..b6554b1 100644
--- a/config/samples/k8s/v1alpha1_engine.nagare.media_functions_data-buffer.yaml
+++ b/config/samples/k8s/v1alpha1_engine.nagare.media_functions_data-buffer-fs.yaml
@@ -3,12 +3,12 @@ kind: ClusterFunction
 metadata:
   labels:
     app.kubernetes.io/name: function
-    app.kubernetes.io/instance: data-buffer
+    app.kubernetes.io/instance: data-buffer-fs
     app.kubernetes.io/version: "0.0.1"
     app.kubernetes.io/part-of: nagare-media-engine
     app.kubernetes.io/created-by: nagare-media-engine
     beta.engine.nagare.media/function-type: data
-  name: data-buffer
+  name: data-buffer-fs
 spec:
   version: 0.0.1
   template: # JobTemplate
@@ -25,7 +25,7 @@ spec:
             runAsGroup: 0
           containers:
             - name: function
-              image: ghcr.io/nagare-media/engine/function-data-buffer:dev
+              image: ghcr.io/nagare-media/engine/function-data-buffer-fs:dev
               imagePullPolicy: IfNotPresent
               ports:
                 - name: stream-http
diff --git a/internal/functions/functions/data-buffer/func.go b/internal/functions/functions/data-buffer-fs/func.go
similarity index 93%
rename from internal/functions/functions/data-buffer/func.go
rename to internal/functions/functions/data-buffer-fs/func.go
index d3c9726..a46955a 100644
--- a/internal/functions/functions/data-buffer/func.go
+++ b/internal/functions/functions/data-buffer-fs/func.go
@@ -28,7 +28,7 @@ import (
 
 // Function description
 const (
-	Name = "data-buffer"
+	Name = "data-buffer-fs"
 )
 
 // function buffers input stream.
@@ -37,7 +37,7 @@ type function struct {
 
 var _ nbmp.Function = &function{}
 
-// Exec data-buffer function.
+// Exec data-buffer-fs function.
 func (f *function) Exec(ctx context.Context) error {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
@@ -50,7 +50,7 @@ func (f *function) Exec(ctx context.Context) error {
 	return nil
 }
 
-// BuildTask from data-buffer function.
+// BuildTask from data-buffer-fs function.
 func BuildTask(ctx context.Context, t *nbmpv2.Task) (nbmp.Function, error) {
 	f := &function{}
 	return f, nil
diff --git a/skaffold.yaml b/skaffold.yaml
index a1326ac..eea35b6 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -4,11 +4,11 @@ metadata:
   name: nagare-media-engine
 build:
   artifacts:
-    - image: ghcr.io/nagare-media/engine/function-data-buffer
+    - image: ghcr.io/nagare-media/engine/function-data-buffer-fs
       runtimeType: go
       context: .
       docker:
-        dockerfile: build/package/image/function-data-buffer/Dockerfile.generic.generic
+        dockerfile: build/package/image/function-data-buffer-fs/Dockerfile.generic.generic
         pullParent: false
         noCache: false
         squash: false
@@ -257,7 +257,7 @@ deploy:
               - "--name"
               - "nagare-media-mgmt"
               - "ghcr.io/nagare-media/engine/workflow-manager-helper:dev"
-              - "ghcr.io/nagare-media/engine/function-data-buffer:dev"
+              - "ghcr.io/nagare-media/engine/function-data-buffer-fs:dev"
               - "ghcr.io/nagare-media/engine/function-generic-noop:dev"
               - "ghcr.io/nagare-media/engine/function-generic-sleep:dev"
               - "ghcr.io/nagare-media/engine/function-media-encode:dev"
@@ -275,7 +275,7 @@ deploy:
               - "--name"
               - "nagare-media-edge"
               - "ghcr.io/nagare-media/engine/workflow-manager-helper:dev"
-              - "ghcr.io/nagare-media/engine/function-data-buffer:dev"
+              - "ghcr.io/nagare-media/engine/function-data-buffer-fs:dev"
               - "ghcr.io/nagare-media/engine/function-generic-noop:dev"
               - "ghcr.io/nagare-media/engine/function-generic-sleep:dev"
               - "ghcr.io/nagare-media/engine/function-media-encode:dev"