diff --git a/tools/perf/design.txt b/tools/perf/design.txt
index d68515f..567a041 100644
--- a/tools/perf/design.txt
+++ b/tools/perf/design.txt
@@ -48,7 +48,7 @@ struct perf_event_attr {
             __u64               sample_freq;
         };
 
-        __u32                   record_type;
+        __u32                   sample_type;
         __u32                   read_format;
 
         __u64                   disabled       :  1, /* off by default        */
@@ -175,20 +175,25 @@ into account.
 
 A "sampling" counter is one that is set up to generate an interrupt
 every N events, where N is given by 'sample_period'.  A sampling counter
-has sample_period > 0. The record_type controls what data is recorded on each
+has sample_period > 0. The sample_type controls what data is recorded on each
 interrupt:
 
 /*
- * Bits that can be set in hw_event.record_type to request information
+ * Bits that can be set in hw_event.sample_type to request information
  * in the overflow packets.
  */
-enum perf_event_record_format {
-        PERF_RECORD_IP          = 1U << 0,
-        PERF_RECORD_TID         = 1U << 1,
-        PERF_RECORD_TIME        = 1U << 2,
-        PERF_RECORD_ADDR        = 1U << 3,
-        PERF_RECORD_GROUP       = 1U << 4,
-        PERF_RECORD_CALLCHAIN   = 1U << 5,
+enum perf_event_sample_format {
+        PERF_SAMPLE_IP              = 1U << 0,
+        PERF_SAMPLE_TID             = 1U << 1,
+        PERF_SAMPLE_TIME            = 1U << 2,
+        PERF_SAMPLE_ADDR            = 1U << 3,
+        PERF_SAMPLE_READ            = 1U << 4,
+        PERF_SAMPLE_CALLCHAIN       = 1U << 5,
+        PERF_SAMPLE_ID              = 1U << 6,
+        PERF_SAMPLE_CPU             = 1U << 7,
+        PERF_SAMPLE_PERIOD          = 1U << 8,
+        PERF_SAMPLE_STREAM_ID       = 1U << 9,
+        PERF_SAMPLE_RAW             = 1U << 10,
 };
 
 Such (and other) events will be recorded in a ring-buffer, which is