diff --git a/pkg/envoy/builder.go b/pkg/envoy/builder.go
index e3038cd4e..66c25241f 100644
--- a/pkg/envoy/builder.go
+++ b/pkg/envoy/builder.go
@@ -29,8 +29,8 @@ type (
 		Encode(ctx context.Context, p Provider) error
 	}
 
-	// Streammer provides a set of streams of encoded documents
-	Streammer interface {
+	// Streamer provides a set of streams of encoded documents
+	Streamer interface {
 		Stream() []*Stream
 	}
 
@@ -38,10 +38,10 @@ type (
 		Preparer
 		Encoder
 	}
-	PrepareEncodeStreammer interface {
+	PrepareEncodeStreamer interface {
 		Preparer
 		Encoder
-		Streammer
+		Streamer
 	}
 )
 
diff --git a/pkg/envoy/csv/encoder.go b/pkg/envoy/csv/encoder.go
index d56e85d26..418f2e1b8 100644
--- a/pkg/envoy/csv/encoder.go
+++ b/pkg/envoy/csv/encoder.go
@@ -53,7 +53,7 @@ var (
 	ErrResourceStateUndefined = errors.New("undefined resource state")
 )
 
-func NewBulkRecordEncoder(cfg *EncoderConfig) envoy.PrepareEncodeStreammer {
+func NewBulkRecordEncoder(cfg *EncoderConfig) envoy.PrepareEncodeStreamer {
 	if cfg == nil {
 		cfg = &EncoderConfig{}
 	}
diff --git a/pkg/envoy/json/encoder.go b/pkg/envoy/json/encoder.go
index cd6cf9034..f506cc61b 100644
--- a/pkg/envoy/json/encoder.go
+++ b/pkg/envoy/json/encoder.go
@@ -53,7 +53,7 @@ var (
 	ErrResourceStateUndefined = errors.New("undefined resource state")
 )
 
-func NewBulkRecordEncoder(cfg *EncoderConfig) envoy.PrepareEncodeStreammer {
+func NewBulkRecordEncoder(cfg *EncoderConfig) envoy.PrepareEncodeStreamer {
 	if cfg == nil {
 		cfg = &EncoderConfig{}
 	}
diff --git a/pkg/envoy/yaml/encoder.go b/pkg/envoy/yaml/encoder.go
index 9572f2937..6399fdf1f 100644
--- a/pkg/envoy/yaml/encoder.go
+++ b/pkg/envoy/yaml/encoder.go
@@ -80,7 +80,7 @@ var (
 )
 
 // NewYamlEncoder initializes a fresh yaml encoder
-func NewYamlEncoder(cfg *EncoderConfig) envoy.PrepareEncodeStreammer {
+func NewYamlEncoder(cfg *EncoderConfig) envoy.PrepareEncodeStreamer {
 	if cfg == nil {
 		cfg = &EncoderConfig{}
 	}