Index: share/man/man4/hwpmc.4
===================================================================
--- share/man/man4/hwpmc.4
+++ share/man/man4/hwpmc.4
@@ -426,7 +426,7 @@
 .It Va kern.hwpmc.mtxpoolsize Pq integer, read-only
 The size of the spin mutex pool used by the PMC driver.
 The default is 32.
-.It Va kern.hwpmc.nbuffers Pq integer, read-only
+.It Va kern.hwpmc.nbuffers_pcpu Pq integer, read-only
 The number of log buffers used by
 .Nm
 for logging.
Index: sys/dev/hwpmc/hwpmc_logging.c
===================================================================
--- sys/dev/hwpmc/hwpmc_logging.c
+++ sys/dev/hwpmc/hwpmc_logging.c
@@ -86,7 +86,7 @@
     &pmclog_buffer_size, 0, "size of log buffers in kilobytes");
 
 /*
- * kern.hwpmc.nbuffer -- number of global log buffers
+ * kern.hwpmc.nbuffers_pcpu -- number of global log buffers
  */
 
 static int pmc_nlogbuffers_pcpu = PMC_NLOGBUFFERS_PCPU;
Index: usr.sbin/pmcstat/pmcstat.c
===================================================================
--- usr.sbin/pmcstat/pmcstat.c
+++ usr.sbin/pmcstat/pmcstat.c
@@ -1455,7 +1455,7 @@
 		    args.pa_verbosity > 0)
 			warnx(
 "WARNING: at least %u event%s were discarded while running.\n"
-"Please consider tuning the \"kern.hwpmc.nbuffers\" tunable.",
+"Please consider tuning the \"kern.hwpmc.nbuffers_pcpu\" tunable.",
 	 		    ds_end.pm_buffer_requests_failed -
 			    ds_start.pm_buffer_requests_failed,
 			    ((ds_end.pm_buffer_requests_failed -