--- a/docs/ppc64-power6-events
+++ b/docs/ppc64-power6-events
@@ -3,11 +3,6 @@
 
 </tr>
 
-<tr><td>CYCLES_RND_SMPL</td><td>	Processor Cycles with random sampling </td><td> 1</td><td>
-</td>
-
-</tr>
-
 <tr><td>PM_RUN_CYC_GRP1</td><td> Run cycles </td><td> 0</td><td>	Group 1 pm_utilization</td>
 
 </tr>
@@ -596,7 +591,7 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_SMT_GRP37</td><td> DISP unit held due to SMT conflicts </td><td> 3</td><td>	Group 37 pm_disp_held</td>
+<tr><td>PM_DPU_HELD_SMT_GRP37</td><td> DISP unit held due to SMT conflicts  </td><td> 3</td><td>	Group 37 pm_disp_held</td>
 
 </tr>
 
@@ -608,7 +603,7 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_CW_GRP38</td><td> DISP unit held due to cache writes </td><td> 2</td><td>	Group 38 pm_disp_held2</td>
+<tr><td>PM_DPU_HELD_CW_GRP38</td><td> DISP unit held due to cache writes  </td><td> 2</td><td>	Group 38 pm_disp_held2</td>
 
 </tr>
 
@@ -620,11 +615,11 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_ISYNC_GRP39</td><td> DISP unit held due to ISYNC </td><td> 1</td><td>	Group 39 pm_disp_held3</td>
-
-</tr>
-
-<tr><td>PM_DPU_HELD_STCX_CR_GRP39</td><td> DISP unit held due to STCX updating CR </td><td> 2</td><td>	Group 39 pm_disp_held3</td>
+<tr><td>PM_DPU_HELD_ISYNC_GRP39</td><td> DISP unit held due to ISYNC  </td><td> 1</td><td>	Group 39 pm_disp_held3</td>
+
+</tr>
+
+<tr><td>PM_DPU_HELD_STCX_CR_GRP39</td><td> DISP unit held due to STCX updating CR  </td><td> 2</td><td>	Group 39 pm_disp_held3</td>
 
 </tr>
 
@@ -640,7 +635,7 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_ITLB_ISLB_GRP40</td><td> DISP unit held due to SLB or TLB invalidates </td><td> 2</td><td>	Group 40 pm_disp_held4</td>
+<tr><td>PM_DPU_HELD_ITLB_ISLB_GRP40</td><td> DISP unit held due to SLB or TLB invalidates  </td><td> 2</td><td>	Group 40 pm_disp_held4</td>
 
 </tr>
 
@@ -656,7 +651,7 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_COMPLETION_GRP41</td><td> DISP unit held due to completion holding dispatch </td><td> 2</td><td>	Group 41 pm_disp_held5</td>
+<tr><td>PM_DPU_HELD_COMPLETION_GRP41</td><td> DISP unit held due to completion holding dispatch  </td><td> 2</td><td>	Group 41 pm_disp_held5</td>
 
 </tr>
 
@@ -696,11 +691,11 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_ISYNC_GRP44</td><td> DISP unit held due to ISYNC </td><td> 0</td><td>	Group 44 pm_disp_held8</td>
-
-</tr>
-
-<tr><td>PM_DPU_HELD_STCX_CR_GRP44</td><td> DISP unit held due to STCX updating CR </td><td> 1</td><td>	Group 44 pm_disp_held8</td>
+<tr><td>PM_DPU_HELD_ISYNC_GRP44</td><td> DISP unit held due to ISYNC  </td><td> 0</td><td>	Group 44 pm_disp_held8</td>
+
+</tr>
+
+<tr><td>PM_DPU_HELD_STCX_CR_GRP44</td><td> DISP unit held due to STCX updating CR  </td><td> 1</td><td>	Group 44 pm_disp_held8</td>
 
 </tr>
 
@@ -712,7 +707,7 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_ISYNC_GRP45</td><td> DISP unit held due to ISYNC </td><td> 0</td><td>	Group 45 pm_disp_held9</td>
+<tr><td>PM_DPU_HELD_ISYNC_GRP45</td><td> DISP unit held due to ISYNC  </td><td> 0</td><td>	Group 45 pm_disp_held9</td>
 
 </tr>
 
@@ -724,7 +719,7 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_COMPLETION_GRP45</td><td> DISP unit held due to completion holding dispatch </td><td> 3</td><td>	Group 45 pm_disp_held9</td>
+<tr><td>PM_DPU_HELD_COMPLETION_GRP45</td><td> DISP unit held due to completion holding dispatch  </td><td> 3</td><td>	Group 45 pm_disp_held9</td>
 
 </tr>
 
@@ -976,7 +971,7 @@
 
 </tr>
 
-<tr><td>PM_LSU_REJECT_EXTERN_GRP61</td><td> LSU external reject request </td><td> 2</td><td>	Group 61 pm_rejects2</td>
+<tr><td>PM_LSU_REJECT_EXTERN_GRP61</td><td> LSU external reject request  </td><td> 2</td><td>	Group 61 pm_rejects2</td>
 
 </tr>
 
@@ -1080,7 +1075,7 @@
 
 </tr>
 
-<tr><td>PM_LSU0_REJECT_EXTERN_GRP68</td><td> LSU0 external reject request </td><td> 0</td><td>	Group 68 pm_rejects_unit3</td>
+<tr><td>PM_LSU0_REJECT_EXTERN_GRP68</td><td> LSU0 external reject request  </td><td> 0</td><td>	Group 68 pm_rejects_unit3</td>
 
 </tr>
 
@@ -1088,7 +1083,7 @@
 
 </tr>
 
-<tr><td>PM_LSU1_REJECT_EXTERN_GRP68</td><td> LSU1 external reject request </td><td> 2</td><td>	Group 68 pm_rejects_unit3</td>
+<tr><td>PM_LSU1_REJECT_EXTERN_GRP68</td><td> LSU1 external reject request  </td><td> 2</td><td>	Group 68 pm_rejects_unit3</td>
 
 </tr>
 
@@ -1488,7 +1483,7 @@
 
 </tr>
 
-<tr><td>PM_FAB_RETRY_SYS_PUMP_GRP93</td><td> Retry of a system pump, locally mastered </td><td> 2</td><td>	Group 93 pm_fab2</td>
+<tr><td>PM_FAB_RETRY_SYS_PUMP_GRP93</td><td> Retry of a system pump, locally mastered  </td><td> 2</td><td>	Group 93 pm_fab2</td>
 
 </tr>
 
@@ -1504,7 +1499,7 @@
 
 </tr>
 
-<tr><td>PM_FAB_ADDR_COLLISION_GRP94</td><td> local node launch collision with off-node address </td><td> 2</td><td>	Group 94 pm_fab3</td>
+<tr><td>PM_FAB_ADDR_COLLISION_GRP94</td><td> local node launch collision with off-node address  </td><td> 2</td><td>	Group 94 pm_fab3</td>
 
 </tr>
 
@@ -1672,7 +1667,7 @@
 
 </tr>
 
-<tr><td>PM_LD_REQ_L2_GRP105</td><td> L2 load requests </td><td> 0</td><td>	Group 105 pm_L2_ldst_reqhit</td>
+<tr><td>PM_LD_REQ_L2_GRP105</td><td> L2 load requests  </td><td> 0</td><td>	Group 105 pm_L2_ldst_reqhit</td>
 
 </tr>
 
@@ -1784,7 +1779,7 @@
 
 </tr>
 
-<tr><td>PM_L2SA_LD_REQ_GRP112</td><td> L2 slice A load requests </td><td> 0</td><td>	Group 112 pm_L2_ld_reqhit_slice</td>
+<tr><td>PM_L2SA_LD_REQ_GRP112</td><td> L2 slice A load requests  </td><td> 0</td><td>	Group 112 pm_L2_ld_reqhit_slice</td>
 
 </tr>
 
@@ -1792,7 +1787,7 @@
 
 </tr>
 
-<tr><td>PM_L2SB_LD_REQ_GRP112</td><td> L2 slice B load requests </td><td> 2</td><td>	Group 112 pm_L2_ld_reqhit_slice</td>
+<tr><td>PM_L2SB_LD_REQ_GRP112</td><td> L2 slice B load requests  </td><td> 2</td><td>	Group 112 pm_L2_ld_reqhit_slice</td>
 
 </tr>
 
@@ -2040,7 +2035,7 @@
 
 </tr>
 
-<tr><td>PM_FPU_1FLOP_GRP128</td><td> FPU executed one flop instruction </td><td> 0</td><td>	Group 128 pm_fpu_flop</td>
+<tr><td>PM_FPU_1FLOP_GRP128</td><td> FPU executed one flop instruction  </td><td> 0</td><td>	Group 128 pm_fpu_flop</td>
 
 </tr>
 
@@ -2420,7 +2415,7 @@
 
 </tr>
 
-<tr><td>PM_MRK_INST_TIMEO_GRP151</td><td> Marked Instruction finish timeout </td><td> 3</td><td>	Group 151 pm_mrk_misc2</td>
+<tr><td>PM_MRK_INST_TIMEO_GRP151</td><td> Marked Instruction finish timeout  </td><td> 3</td><td>	Group 151 pm_mrk_misc2</td>
 
 </tr>
 
@@ -2952,7 +2947,7 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_COMPLETION_GRP185</td><td> DISP unit held due to completion holding dispatch </td><td> 0</td><td>	Group 185 pm_edge10</td>
+<tr><td>PM_DPU_HELD_COMPLETION_GRP185</td><td> DISP unit held due to completion holding dispatch  </td><td> 0</td><td>	Group 185 pm_edge10</td>
 
 </tr>
 
@@ -2968,7 +2963,7 @@
 
 </tr>
 
-<tr><td>PM_DPU_HELD_COMPLETION_GRP186</td><td> DISP unit held due to completion holding dispatch </td><td> 0</td><td>	Group 186 pm_noedge10</td>
+<tr><td>PM_DPU_HELD_COMPLETION_GRP186</td><td> DISP unit held due to completion holding dispatch  </td><td> 0</td><td>	Group 186 pm_noedge10</td>
 
 </tr>
 
@@ -2984,7 +2979,7 @@
 
 </tr>
 
-<tr><td>PM_FPU_1FLOP_GRP187</td><td> FPU executed one flop instruction </td><td> 0</td><td>	Group 187 pm_hpm1</td>
+<tr><td>PM_FPU_1FLOP_GRP187</td><td> FPU executed one flop instruction  </td><td> 0</td><td>	Group 187 pm_hpm1</td>
 
 </tr>
 
@@ -3096,7 +3091,7 @@
 
 </tr>
 
-<tr><td>PM_FPU_1FLOP_GRP194</td><td> FPU executed one flop instruction </td><td> 0</td><td>	Group 194 pm_hpm8</td>
+<tr><td>PM_FPU_1FLOP_GRP194</td><td> FPU executed one flop instruction  </td><td> 0</td><td>	Group 194 pm_hpm8</td>
 
 </tr>