diff --git a/config/config.go b/config/config.go
index 3446c29eb..fff50e8e6 100644
--- a/config/config.go
+++ b/config/config.go
@@ -635,7 +635,7 @@ type ScrapeConfig struct {
 	ScrapeProtocols []ScrapeProtocol `yaml:"scrape_protocols,omitempty"`
 	// Whether to scrape a classic histogram that is also exposed as a native histogram.
 	ScrapeClassicHistograms bool `yaml:"scrape_classic_histograms,omitempty"`
-	// Whether to convert a scraped classic histogram into a native histogram with custom buckets.
+	// Whether to convert all scraped classic histograms into a native histogram with custom buckets.
 	ConvertClassicHistograms bool `yaml:"convert_classic_histograms,omitempty"`
 	// File to which scrape failures are logged.
 	ScrapeFailureLogFile string `yaml:"scrape_failure_log_file,omitempty"`
diff --git a/model/textparse/benchmark_test.go b/model/textparse/benchmark_test.go
index bc9c2d1db..98aadb0ed 100644
--- a/model/textparse/benchmark_test.go
+++ b/model/textparse/benchmark_test.go
@@ -40,7 +40,7 @@ var newTestParserFns = map[string]newParser{
 	"omtext": func(b []byte, st *labels.SymbolTable) Parser {
 		return NewOpenMetricsParser(b, st, WithOMParserCTSeriesSkipped())
 	},
-	"nhcb_over_omtext": func(b []byte, st *labels.SymbolTable) Parser {
+	"omtext_with_nhcb": func(b []byte, st *labels.SymbolTable) Parser {
 		p := NewOpenMetricsParser(b, st, WithOMParserCTSeriesSkipped())
 		return NewNHCBParser(p, st, false)
 	},