diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3
index 90d19dfcab33..ec310548d08e 100644
--- a/lib/libpmc/pmc.corei7.3
+++ b/lib/libpmc/pmc.corei7.3
@@ -1549,18 +1549,18 @@ Counts number of segment register loads.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.westmere 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmere 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3
index 5b991138b73b..3bcda1c7b499 100644
--- a/lib/libpmc/pmc.corei7uc.3
+++ b/lib/libpmc/pmc.corei7uc.3
@@ -853,18 +853,18 @@ refreshed or needs to go into a power down mode.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.westmere 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmere 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.haswell.3 b/lib/libpmc/pmc.haswell.3
index ace9c2a544ef..e535d68824db 100644
--- a/lib/libpmc/pmc.haswell.3
+++ b/lib/libpmc/pmc.haswell.3
@@ -936,25 +936,25 @@ Dirty L2 cache lines evicted by demand.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7 3 ,
+.Xr pmc.corei7uc 3 ,
+.Xr pmc.haswelluc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
+.Xr pmc.ivybridge 3 ,
+.Xr pmc.ivybridgexeon 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.haswelluc 3 ,
-.Xr pmc.ivybridge 3 ,
-.Xr pmc.ivybridgexeon 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
-.Xr pmc.westmere 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmere 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.ivybridge.3 b/lib/libpmc/pmc.ivybridge.3
index b8ad8e00c712..a4d9f949845b 100644
--- a/lib/libpmc/pmc.ivybridge.3
+++ b/lib/libpmc/pmc.ivybridge.3
@@ -844,23 +844,23 @@ Dirty L2 cache lines evicted by the MLC prefetcher.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7 3 ,
+.Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
+.Xr pmc.ivybridgexeon 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.ivybridgexeon 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
-.Xr pmc.westmere 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmere 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.ivybridgexeon.3 b/lib/libpmc/pmc.ivybridgexeon.3
index 3a5b7096b3a2..31a4caa6e342 100644
--- a/lib/libpmc/pmc.ivybridgexeon.3
+++ b/lib/libpmc/pmc.ivybridgexeon.3
@@ -874,23 +874,23 @@ Dirty L2 cache lines filling the L2.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7 3 ,
+.Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
+.Xr pmc.ivybridge 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.ivybridge 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
-.Xr pmc.westmere 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmere 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.sandybridgexeon.3 b/lib/libpmc/pmc.sandybridgexeon.3
index 9a80f7892d13..17a1bf9fcd67 100644
--- a/lib/libpmc/pmc.sandybridgexeon.3
+++ b/lib/libpmc/pmc.sandybridgexeon.3
@@ -987,23 +987,24 @@ Split locks in SQ.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7 3 ,
+.Xr pmc.corei7uc 3 ,
+.Xr pmc.haswelluc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
+.Xr pmc.ivybridge 3 ,
+.Xr pmc.ivybridgexeon 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.ivybridge 3 ,
-.Xr pmc.ivybridgexeon 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
-.Xr pmc.westmere 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmere 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.soft.3 b/lib/libpmc/pmc.soft.3
index 5d331e220a97..ec532066bead 100644
--- a/lib/libpmc/pmc.soft.3
+++ b/lib/libpmc/pmc.soft.3
@@ -76,17 +76,17 @@ Write page fault.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7 3 ,
+.Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3
index 6b027868d102..bdbb20029997 100644
--- a/lib/libpmc/pmc.ucf.3
+++ b/lib/libpmc/pmc.ucf.3
@@ -86,18 +86,18 @@ offset C0H under device number 0 and Function 0.
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
+.Xr pmc.corei7 3 ,
+.Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.westmere 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.westmere 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3
index 6bfdf391c8b6..36684609f6d5 100644
--- a/lib/libpmc/pmc.westmere.3
+++ b/lib/libpmc/pmc.westmere.3
@@ -1371,18 +1371,18 @@ Counts number of SID integer 64 bit shift or move operations.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7 3 ,
+.Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.westmereuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3
index 2f260c24456d..23319cfa5fb3 100644
--- a/lib/libpmc/pmc.westmereuc.3
+++ b/lib/libpmc/pmc.westmereuc.3
@@ -1056,18 +1056,18 @@ disabled.
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
+.Xr pmc.corei7 3 ,
+.Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.ucf 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
-.Xr pmc.corei7 3 ,
-.Xr pmc.corei7uc 3 ,
-.Xr pmc.westmere 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.ucf 3 ,
+.Xr pmc.westmere 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
diff --git a/lib/libpmc/pmc.xscale.3 b/lib/libpmc/pmc.xscale.3
index 5a496b942ade..d5766e347173 100644
--- a/lib/libpmc/pmc.xscale.3
+++ b/lib/libpmc/pmc.xscale.3
@@ -132,9 +132,9 @@ and the underlying hardware events used.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
+.Xr pmc.soft 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
-.Xr pmc.soft 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
diff --git a/lib/libpmc/pmc_capabilities.3 b/lib/libpmc/pmc_capabilities.3
index 8c5916e38a8e..c0df754194cf 100644
--- a/lib/libpmc/pmc_capabilities.3
+++ b/lib/libpmc/pmc_capabilities.3
@@ -223,8 +223,8 @@ The argument to the function was invalid.
 .Xr pmc_allocate 3 ,
 .Xr pmc_get_driver_stats 3 ,
 .Xr pmc_name_of_capability 3 ,
-.Xr pmc_name_of_cputype 3 ,
 .Xr pmc_name_of_class 3 ,
+.Xr pmc_name_of_cputype 3 ,
 .Xr pmc_name_of_event 3 ,
 .Xr pmc_name_of_mode 3 ,
 .Xr hwpmc 4