diff --git a/app/vminsert/common/insert_ctx.go b/app/vminsert/common/insert_ctx.go
index 153e003bd..67ed92d90 100644
--- a/app/vminsert/common/insert_ctx.go
+++ b/app/vminsert/common/insert_ctx.go
@@ -146,7 +146,7 @@ func (ctx *InsertCtx) FlushBufs() error {
 	}
 	// There is no need in limiting the number of concurrent calls to vmstorage.AddRows() here,
 	// since the number of concurrent FlushBufs() calls should be already limited via writeconcurrencylimiter
-	// used at every ParseStream() call under lib/protoparser/*/streamparser.go
+	// used at every stream.Parse() call under lib/protoparser/*
 	err := vmstorage.AddRows(ctx.mrs)
 	ctx.Reset(0)
 	if err == nil {
diff --git a/lib/promscrape/client.go b/lib/promscrape/client.go
index 185c693ad..52fa157b5 100644
--- a/lib/promscrape/client.go
+++ b/lib/promscrape/client.go
@@ -39,7 +39,7 @@ type client struct {
 	// hc is the default client optimized for common case of scraping targets with moderate number of metrics.
 	hc *fasthttp.HostClient
 
-	// sc (aka `stream client`) is used instead of hc if ScrapeWork.ParseStream is set.
+	// sc (aka `stream client`) is used instead of hc if ScrapeWork.StreamParse is set.
 	// It may be useful for scraping targets with millions of metrics per target.
 	sc *http.Client
 
diff --git a/lib/protoparser/prometheus/stream/streamparser_test.go b/lib/protoparser/prometheus/stream/streamparser_test.go
index d9eed3d52..fb37b49a2 100644
--- a/lib/protoparser/prometheus/stream/streamparser_test.go
+++ b/lib/protoparser/prometheus/stream/streamparser_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
 )
 
-func TestParseStream(t *testing.T) {
+func TestParse(t *testing.T) {
 	common.StartUnmarshalWorkers()
 	defer common.StopUnmarshalWorkers()
 
diff --git a/lib/protoparser/promremotewrite/stream/streamparser.go b/lib/protoparser/promremotewrite/stream/streamparser.go
index 23d7693c7..cabbd4b20 100644
--- a/lib/protoparser/promremotewrite/stream/streamparser.go
+++ b/lib/protoparser/promremotewrite/stream/streamparser.go
@@ -32,7 +32,7 @@ func Parse(r io.Reader, callback func(tss []prompb.TimeSeries) error) error {
 		return err
 	}
 
-	// Synchronously process the request in order to properly return errors to ParseStream caller,
+	// Synchronously process the request in order to properly return errors to Parse caller,
 	// so it could properly return HTTP 503 status code in response.
 	// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/896
 	bb := bodyBufferPool.Get()