changeset 74:ef0e8692fe0e

BenchmarkType -> Mode.
author shade
date Tue, 04 Jun 2013 13:44:21 +0400
parents 538e773eb07b
children 7b2aed5bd1ba
files jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/BlackholeBench.java jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/DeadCodeBench.java jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelInvocationBench.java jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelIterationBench.java jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelTrialBench.java jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/NanotimeBench.java jmh-core-it/src/test/java/org/openjdk/jmh/it/IterationCountCmdTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/SingleShotTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/BlackholeApiTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/GroupLabelTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleBenchmarkStateTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleExecGroupStateTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleGroupStateTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleThreadStateTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/OperationsPerInvocationTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPClassTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPMethodTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/blackhole/BlackholeTypesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkBenchExceptionSignaturesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkStateExceptionSignaturesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupBenchExceptionSignaturesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupStateExceptionSignaturesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadBenchExceptionSignaturesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadStateExceptionSignaturesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedBenchTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateSetupTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateTearDownTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedClassForkedTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest2.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmAppendPrependArgsTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmArgsTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_D_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F0_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F1_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_D_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F0_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F1_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_D_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F0_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F1_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_D_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F0_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F1_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkBenchOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkStateOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupBenchOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupStateOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadBenchOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadStateOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchSetupOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchTearDownOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateSetupOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateTearDownOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchSetupOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchTearDownOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateSetupOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateTearDownOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchSetupOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchTearDownOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateSetupOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateTearDownOrderTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateInvocationTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateIterationTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateRunTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateInvocationTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateIterationTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateRunTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateInvocationTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateIterationTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateRunTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkBenchSharingTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkStateSharingTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupBenchSharingTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultBenchSharingTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultStateSharingTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupStateSharingTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadBenchSharingTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadStateSharingTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkBenchSameThreadTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkStateSameThreadTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupBenchSameThreadTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupStateSameThreadTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadBenchSameThreadTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadStateSameThreadTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkBenchHelperTimesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkStateHelperTimesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupBenchHelperTimesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupStateHelperTimesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadBenchHelperTimesTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadStateHelperTimesTest.java jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkMode.java jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkType.java jmh-core/src/main/java/org/openjdk/jmh/annotations/GenerateMicroBenchmark.java jmh-core/src/main/java/org/openjdk/jmh/annotations/MicroBenchmark.java jmh-core/src/main/java/org/openjdk/jmh/annotations/Mode.java jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java jmh-core/src/main/java/org/openjdk/jmh/processor/internal/MethodGroup.java jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkRecord.java jmh-core/src/main/java/org/openjdk/jmh/runner/MicroBenchmarkHandlers.java jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java jmh-core/src/main/java/org/openjdk/jmh/runner/options/handlers/BenchmarkTypeOptionHandler.java jmh-core/src/main/java/org/openjdk/jmh/runner/parameters/MicroBenchmarkParametersFactory.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_17_SyncIterations.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java
diffstat 160 files changed, 430 insertions(+), 435 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/BlackholeBench.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/BlackholeBench.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.benchmarks;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -38,7 +38,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @State(Scope.Thread)
 public class BlackholeBench {
--- a/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/DeadCodeBench.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/DeadCodeBench.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.benchmarks;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -35,7 +35,7 @@
 
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @State(Scope.Thread)
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 public class DeadCodeBench {
 
     public int x = 1;
--- a/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelInvocationBench.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelInvocationBench.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.benchmarks;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -36,7 +36,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class LevelInvocationBench {
 
--- a/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelIterationBench.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelIterationBench.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.benchmarks;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -36,7 +36,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class LevelIterationBench {
 
--- a/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelTrialBench.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelTrialBench.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.benchmarks;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -36,7 +36,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class LevelTrialBench {
 
--- a/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/NanotimeBench.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/NanotimeBench.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.benchmarks;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
@@ -40,13 +40,13 @@
     private long last;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.AverageTimePerOp)
+    @BenchmarkMode(Mode.AverageTimePerOp)
     public long latency_avg() {
         return System.nanoTime();
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.AverageTimePerOp)
+    @BenchmarkMode(Mode.AverageTimePerOp)
     public long granularity_avg() {
         long lst = last;
         long cur;
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.SampleTimePerOp)
+    @BenchmarkMode(Mode.SampleTimePerOp)
     public long granularity() {
         long lst = last;
         long cur;
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/IterationCountCmdTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/IterationCountCmdTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Setup;
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     public void test() {
         Fixtures.work();
     }
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/SingleShotTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/SingleShotTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 
 import java.util.concurrent.atomic.AtomicInteger;
@@ -38,7 +38,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.SingleShotTime)
+@BenchmarkMode(Mode.SingleShotTime)
 public class SingleShotTest {
 
     private static final AtomicInteger test1executed = new AtomicInteger();
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/BlackholeApiTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/BlackholeApiTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.it.compile;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.it.Fixtures;
 import org.openjdk.jmh.logic.BlackHole;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class BlackholeApiTest {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/GroupLabelTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/GroupLabelTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,12 +24,12 @@
  */
 package org.openjdk.jmh.it.compile;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Group;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class GroupLabelTest {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleBenchmarkStateTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleBenchmarkStateTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jmh.it.compile;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class MultipleBenchmarkStateTest {
 
     @State(Scope.Benchmark)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleExecGroupStateTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleExecGroupStateTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,13 +25,13 @@
 package org.openjdk.jmh.it.compile;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Group;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class MultipleExecGroupStateTest {
 
     @State(Scope.Group)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleGroupStateTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleGroupStateTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jmh.it.compile;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class MultipleGroupStateTest {
 
     @State(Scope.Group)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleThreadStateTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleThreadStateTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,13 +24,13 @@
  */
 package org.openjdk.jmh.it.compile;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class MultipleThreadStateTest {
 
     @State(Scope.Thread)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/OperationsPerInvocationTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/OperationsPerInvocationTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jmh.it.compile;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class OperationsPerInvocationTest {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPClassTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPClassTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,11 +24,11 @@
  */
 package org.openjdk.jmh.it.compile;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public strictfp class StrictFPClassTest {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPMethodTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPMethodTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,10 +25,10 @@
 package org.openjdk.jmh.it.compile;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class StrictFPMethodTest {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/blackhole/BlackholeTypesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/blackhole/BlackholeTypesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.it.compile.blackhole;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Scope;
@@ -32,7 +32,7 @@
 import org.openjdk.jmh.logic.BlackHole;
 
 @State(Scope.Thread)
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class BlackholeTypesTest {
 
     public byte b;
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkBenchExceptionSignaturesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkBenchExceptionSignaturesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.it.compile.exceptions;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
@@ -34,7 +34,7 @@
 import org.openjdk.jmh.annotations.TearDown;
 
 @State(Scope.Benchmark)
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class BenchmarkBenchExceptionSignaturesTest {
 
     @Setup(Level.Trial)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkStateExceptionSignaturesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkStateExceptionSignaturesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.it.compile.exceptions;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
@@ -33,7 +33,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class BenchmarkStateExceptionSignaturesTest {
 
     @State(Scope.Benchmark)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupBenchExceptionSignaturesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupBenchExceptionSignaturesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.it.compile.exceptions;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -33,7 +33,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @State(Scope.Group)
 public class GroupBenchExceptionSignaturesTest {
 
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupStateExceptionSignaturesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupStateExceptionSignaturesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.it.compile.exceptions;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -33,7 +33,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class GroupStateExceptionSignaturesTest {
 
     @State(Scope.Group)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadBenchExceptionSignaturesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadBenchExceptionSignaturesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.it.compile.exceptions;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
@@ -33,7 +33,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @State(Scope.Thread)
 public class ThreadBenchExceptionSignaturesTest {
 
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadStateExceptionSignaturesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadStateExceptionSignaturesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.it.compile.exceptions;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
@@ -33,7 +33,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class ThreadStateExceptionSignaturesTest {
 
     @State(Scope.Thread)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -44,7 +44,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @State(Scope.Benchmark)
 public class FailingBenchmarkBenchSetupTest {
 
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -53,7 +53,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -48,7 +48,7 @@
 public class FailingBenchmarkBenchTest {
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -55,7 +55,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -55,7 +55,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedBenchTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedBenchTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.State;
@@ -46,7 +46,7 @@
 public class FailingForkedBenchTest {
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -52,7 +52,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -52,7 +52,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -53,7 +53,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -53,7 +53,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -47,7 +47,7 @@
 public class FailingGroupBenchTest {
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -55,7 +55,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -55,7 +55,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -53,7 +53,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -53,7 +53,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import junit.framework.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -47,7 +47,7 @@
 public class FailingThreadBenchTest {
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -55,7 +55,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -55,7 +55,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -43,7 +43,7 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @State(Scope.Benchmark)
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AbstractBenchmarkBenchSetupTest extends AbstractSetupBase {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -43,7 +43,7 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @State(Scope.Benchmark)
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AbstractBenchmarkBenchTearDownTest extends AbstractTearDownBase {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AbstractBenchmarkStateSetupTest {
 
     @State(Scope.Benchmark)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AbstractBenchmarkStateTearDownTest {
 
     @State(Scope.Benchmark)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @State(Scope.Group)
 public class AbstractGroupBenchSetupTest extends AbstractSetupBase {
 
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @State(Scope.Group)
 public class AbstractGroupBenchTearDownTest extends AbstractTearDownBase {
 
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AbstractGroupStateSetupTest {
 
     @State(Scope.Group)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AbstractGroupStateTearDownTest {
 
     @State(Scope.Group)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @State(Scope.Thread)
 public class AbstractThreadBenchSetupTest extends AbstractSetupBase {
 
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @State(Scope.Thread)
 public class AbstractThreadBenchTearDownTest extends AbstractTearDownBase {
 
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AbstractThreadStateSetupTest {
 
     @State(Scope.Thread)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -42,7 +42,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AbstractThreadStateTearDownTest {
 
     @State(Scope.Thread)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritBenchmarkBenchSetupTest extends InheritableBenchmarkSetupState {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritBenchmarkBenchTearDownTest extends InheritableBenchmarkTearDownState {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritBenchmarkStateSetupTest {
 
     public static class MyState extends InheritableBenchmarkSetupState {}
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritBenchmarkStateTearDownTest {
 
     public static class MyState extends InheritableBenchmarkTearDownState {}
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritGroupBenchSetupTest extends InheritableGroupSetupState {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritGroupBenchTearDownTest extends InheritableGroupTearDownState {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritGroupStateSetupTest {
 
     public static class MyState extends InheritableGroupSetupState {}
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritGroupStateTearDownTest {
 
     public static class MyState extends InheritableGroupTearDownState {}
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritThreadBenchSetupTest extends InheritableThreadSetupState {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritThreadBenchTearDownTest extends InheritableThreadTearDownState {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateSetupTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateSetupTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritThreadStateSetupTest {
 
     public static class MyState extends InheritableThreadSetupState {}
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateTearDownTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateTearDownTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
@@ -40,7 +40,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class InheritThreadStateTearDownTest {
 
     public static class MyState extends InheritableThreadTearDownState {}
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedClassForkedTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedClassForkedTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -42,7 +42,7 @@
  *
  * @author Sergey Kuksenko (sergey.kuksenko@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 @Fork
 public class AnnotatedClassForkedTest {
 
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -42,7 +42,7 @@
  *
  * @author Sergey Kuksenko (sergey.kuksenko@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AnnotatedForkedTest {
 
     private static volatile boolean test1executed;
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest2.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest2.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -42,7 +42,7 @@
  *
  * @author Sergey Kuksenko (sergey.kuksenko@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class AnnotatedForkedTest2 {
 
     private static volatile boolean test1executed;
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmAppendPrependArgsTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmAppendPrependArgsTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -41,7 +41,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class ForkedJvmAppendPrependArgsTest {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmArgsTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmArgsTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -41,7 +41,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class ForkedJvmArgsTest {
 
     @GenerateMicroBenchmark
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Warmup;
@@ -41,7 +41,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@BenchmarkMode(BenchmarkType.All)
+@BenchmarkMode(Mode.All)
 public class ForkedTest {
 
     private static volatile boolean test1executed;
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_D_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_D_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Warmup;
@@ -46,7 +46,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test1() {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F0_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F0_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -46,7 +46,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test1() {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F1_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F1_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Warmup;
@@ -46,7 +46,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test1() {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -46,7 +46,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test1() {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_D_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_D_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork(0)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F0_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F0_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork(0)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F1_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F1_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork(0)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork(0)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_D_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_D_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork(1)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F0_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F0_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork(1)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F1_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F1_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork(1)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork(1)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_D_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_D_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F0_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F0_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F1_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F1_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F_Test.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F_Test.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
@@ -47,7 +47,7 @@
     private static volatile boolean sameVM;
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Fork
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkBenchOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkBenchOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -88,7 +88,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(1)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkStateOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkStateOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -90,7 +90,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(1)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupBenchOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupBenchOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -88,7 +88,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(1)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupStateOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupStateOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -90,7 +90,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(1)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadBenchOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadBenchOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -88,7 +88,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(1)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadStateOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadStateOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -90,7 +90,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(1)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchSetupOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchSetupOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -122,7 +122,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchTearDownOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchTearDownOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -122,7 +122,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateSetupOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateSetupOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -126,7 +126,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test(MyState state) {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateTearDownOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateTearDownOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
@@ -134,7 +134,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test(MyState state) {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchSetupOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchSetupOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -122,7 +122,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchTearDownOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchTearDownOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -122,7 +122,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateSetupOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateSetupOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -126,7 +126,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test(MyState state) {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateTearDownOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateTearDownOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
@@ -134,7 +134,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test(MyState state) {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchSetupOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchSetupOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -122,7 +122,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchTearDownOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchTearDownOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -122,7 +122,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateSetupOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateSetupOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -126,7 +126,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test(MyState state) {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateTearDownOrderTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateTearDownOrderTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -27,7 +27,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
@@ -134,7 +134,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     public void test(MyState state) {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateInvocationTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateInvocationTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateIterationTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateIterationTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 50, time = 10, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateRunTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateRunTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateInvocationTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateInvocationTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateIterationTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateIterationTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 50, time = 10, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateRunTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateRunTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateInvocationTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateInvocationTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateIterationTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateIterationTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 50, time = 10, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateRunTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateRunTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -58,7 +58,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkBenchSharingTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkBenchSharingTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -49,7 +49,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkStateSharingTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkStateSharingTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -51,7 +51,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupBenchSharingTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupBenchSharingTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -49,7 +49,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
@@ -60,7 +60,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultBenchSharingTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultBenchSharingTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -49,7 +49,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultStateSharingTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultStateSharingTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -51,7 +51,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupStateSharingTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupStateSharingTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -51,7 +51,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
@@ -62,7 +62,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadBenchSharingTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadBenchSharingTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -49,7 +49,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadStateSharingTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadStateSharingTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -51,7 +51,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkBenchSameThreadTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkBenchSameThreadTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -93,7 +93,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkStateSameThreadTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkStateSameThreadTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -97,7 +97,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupBenchSameThreadTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupBenchSameThreadTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -93,7 +93,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupStateSameThreadTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupStateSameThreadTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -97,7 +97,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadBenchSameThreadTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadBenchSameThreadTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -107,7 +107,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadStateSameThreadTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadStateSameThreadTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -111,7 +111,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 5, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(4)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkBenchHelperTimesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkBenchHelperTimesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -135,7 +135,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkStateHelperTimesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkStateHelperTimesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -139,7 +139,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupBenchHelperTimesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupBenchHelperTimesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -135,7 +135,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupStateHelperTimesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupStateHelperTimesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -139,7 +139,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadBenchHelperTimesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadBenchHelperTimesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -131,7 +131,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadStateHelperTimesTest.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadStateHelperTimesTest.java	Tue Jun 04 13:44:21 2013 +0400
@@ -135,7 +135,7 @@
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.All)
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS)
     @Threads(2)
--- a/jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkMode.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkMode.java	Tue Jun 04 13:44:21 2013 +0400
@@ -29,6 +29,6 @@
  */
 public @interface BenchmarkMode {
 
-    BenchmarkType value();
+    Mode value();
 
 }
--- a/jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkType.java	Tue Jun 04 13:40:17 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/**
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.jmh.annotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Benchmark type.
- *
- * @author Staffan Friberg
- * @author Sergey Kuksenko
- * @author Aleksey Shipilev
- */
-public enum BenchmarkType {
-
-    /**
-     * Operations per unit of time,
-     * {@link org.openjdk.jmh.logic.results.OpsPerTimeUnit}. */
-    OpsPerTimeUnit("thrpt", "Throughput, ops/time"),
-
-    /**
-     * Average time per operation
-     * {@link org.openjdk.jmh.logic.results.AverageTimePerOp}.
-     */
-    AverageTimePerOp("avgt", "Average time, time/op"),
-
-    /**
-     * Time distribution, percentile estimation
-     * {@link org.openjdk.jmh.logic.results.SampleTimePerOp}.
-     */
-    SampleTimePerOp("sample", "Sampling time"),
-
-    /**
-     * Time the single execution
-     * {@link org.openjdk.jmh.logic.results.SingleShotTime}.
-     */
-    SingleShotTime("ss", "Single shot invocation time"),
-
-    /**
-     * Meta-mode: all the modes.
-     * This is mostly useful for testing.
-     */
-    All("all", "TEST MODE"),
-
-    ;
-    private final String shortLabel;
-    private final String longLabel;
-
-    BenchmarkType(String shortLabel, String longLabel) {
-        this.shortLabel = shortLabel;
-        this.longLabel = longLabel;
-    }
-
-    public String shortLabel() {
-        return shortLabel;
-    }
-
-    public String longLabel() {
-        return longLabel;
-    }
-
-    public static BenchmarkType deepValueOf(String name) {
-        try {
-            return BenchmarkType.valueOf(name);
-        } catch (IllegalArgumentException iae) {
-            BenchmarkType inferred = null;
-            for (BenchmarkType type : values()) {
-                if (type.shortLabel().startsWith(name)) {
-                    if (inferred == null) {
-                        inferred = type;
-                    } else {
-                        throw new IllegalStateException("Unable to parse benchmark mode, ambiguous prefix given: \"" + name + "\"\n" +
-                                "Known values are " + getKnown());
-                    }
-                }
-            }
-            if (inferred != null) {
-                return inferred;
-            } else {
-                throw new IllegalStateException("Unable to parse benchmark mode: \"" + name + "\"\n" +
-                        "Known values are " + getKnown());
-            }
-        }
-    }
-
-    public static List<String> getKnown() {
-        List<String> res = new ArrayList<String>();
-        for (BenchmarkType type : BenchmarkType.values()) {
-            res.add(type.toString());
-        }
-        for (BenchmarkType type : BenchmarkType.values()) {
-            res.add(type.shortLabel());
-        }
-        return res;
-    }
-
-}
--- a/jmh-core/src/main/java/org/openjdk/jmh/annotations/GenerateMicroBenchmark.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/annotations/GenerateMicroBenchmark.java	Tue Jun 04 13:44:21 2013 +0400
@@ -35,7 +35,7 @@
  * Annotation processors will translate methods marked with this annotation
  * to correct {@link MicroBenchmark}-annotated classes.
  * <p>
- * This annotation only accepts parameters affecting the workload generation, now only {@link BenchmarkType}.
+ * This annotation only accepts parameters affecting the workload generation, now only {@link Mode}.
  * Other parameters for run control are available as separate annotations
  * (e.g. {@link Measurement}, {@link Threads}, and {@link Fork}),
  * which can be used both for concrete {@link GenerateMicroBenchmark}-annotated methods,
--- a/jmh-core/src/main/java/org/openjdk/jmh/annotations/MicroBenchmark.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/annotations/MicroBenchmark.java	Tue Jun 04 13:44:21 2013 +0400
@@ -46,8 +46,8 @@
 
     /**
      * Type of benchmark.
-     * See {@link BenchmarkType} for available benchmark types.
+     * See {@link Mode} for available benchmark types.
      */
-    public BenchmarkType value() default BenchmarkType.OpsPerTimeUnit;
+    public Mode value() default Mode.OpsPerTimeUnit;
 
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jmh-core/src/main/java/org/openjdk/jmh/annotations/Mode.java	Tue Jun 04 13:44:21 2013 +0400
@@ -0,0 +1,120 @@
+/**
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jmh.annotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Benchmark type.
+ *
+ * @author Staffan Friberg
+ * @author Sergey Kuksenko
+ * @author Aleksey Shipilev
+ */
+public enum Mode {
+
+    /**
+     * Operations per unit of time,
+     * {@link org.openjdk.jmh.logic.results.OpsPerTimeUnit}. */
+    OpsPerTimeUnit("thrpt", "Throughput, ops/time"),
+
+    /**
+     * Average time per operation
+     * {@link org.openjdk.jmh.logic.results.AverageTimePerOp}.
+     */
+    AverageTimePerOp("avgt", "Average time, time/op"),
+
+    /**
+     * Time distribution, percentile estimation
+     * {@link org.openjdk.jmh.logic.results.SampleTimePerOp}.
+     */
+    SampleTimePerOp("sample", "Sampling time"),
+
+    /**
+     * Time the single execution
+     * {@link org.openjdk.jmh.logic.results.SingleShotTime}.
+     */
+    SingleShotTime("ss", "Single shot invocation time"),
+
+    /**
+     * Meta-mode: all the modes.
+     * This is mostly useful for testing.
+     */
+    All("all", "TEST MODE"),
+
+    ;
+    private final String shortLabel;
+    private final String longLabel;
+
+    Mode(String shortLabel, String longLabel) {
+        this.shortLabel = shortLabel;
+        this.longLabel = longLabel;
+    }
+
+    public String shortLabel() {
+        return shortLabel;
+    }
+
+    public String longLabel() {
+        return longLabel;
+    }
+
+    public static Mode deepValueOf(String name) {
+        try {
+            return Mode.valueOf(name);
+        } catch (IllegalArgumentException iae) {
+            Mode inferred = null;
+            for (Mode type : values()) {
+                if (type.shortLabel().startsWith(name)) {
+                    if (inferred == null) {
+                        inferred = type;
+                    } else {
+                        throw new IllegalStateException("Unable to parse benchmark mode, ambiguous prefix given: \"" + name + "\"\n" +
+                                "Known values are " + getKnown());
+                    }
+                }
+            }
+            if (inferred != null) {
+                return inferred;
+            } else {
+                throw new IllegalStateException("Unable to parse benchmark mode: \"" + name + "\"\n" +
+                        "Known values are " + getKnown());
+            }
+        }
+    }
+
+    public static List<String> getKnown() {
+        List<String> res = new ArrayList<String>();
+        for (Mode type : Mode.values()) {
+            res.add(type.toString());
+        }
+        for (Mode type : Mode.values()) {
+            res.add(type.shortLabel());
+        }
+        return res;
+    }
+
+}
--- a/jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java	Tue Jun 04 13:44:21 2013 +0400
@@ -217,7 +217,7 @@
         // enforce the default value
         for (MethodGroup group : result.values()) {
             if (group.getMode() == null) {
-                group.setMode(BenchmarkType.OpsPerTimeUnit);
+                group.setMode(Mode.OpsPerTimeUnit);
             }
         }
 
@@ -248,7 +248,7 @@
         return String.valueOf(result);
     }
 
-    private String packageNameByType(BenchmarkType bt) {
+    private String packageNameByType(Mode bt) {
         switch (bt) {
             case OpsPerTimeUnit:
                 return "throughput";
@@ -311,8 +311,8 @@
                     }
                 }
 
-                for (BenchmarkType benchmarkKind : BenchmarkType.values()) {
-                    if (benchmarkKind == BenchmarkType.All) continue;
+                for (Mode benchmarkKind : Mode.values()) {
+                    if (benchmarkKind == Mode.All) continue;
                     generateMethod(benchmarkKind, writer, info.methodGroups.get(groupName), states);
                 }
                 states.clearArgs();
@@ -413,7 +413,7 @@
         writer.println("import " + SingleShotTime.class.getName() + ';');
         writer.println("import " + SampleBuffer.class.getName() + ';');
         writer.println("import " + MicroBenchmark.class.getName() + ';');
-        writer.println("import " + BenchmarkType.class.getName() + ';');
+        writer.println("import " + Mode.class.getName() + ';');
         writer.println("import " + Fork.class.getName() + ';');
         writer.println("import " + Measurement.class.getName() + ';');
         writer.println("import " + Threads.class.getName() + ';');
@@ -502,7 +502,7 @@
      * @param writer
      * @param methodGroup
      */
-    private void generateMethod(BenchmarkType benchmarkKind, PrintWriter writer, MethodGroup methodGroup, StateObjectHandler states) {
+    private void generateMethod(Mode benchmarkKind, PrintWriter writer, MethodGroup methodGroup, StateObjectHandler states) {
         writer.println();
         for (String ann : generateMethodAnnotations(benchmarkKind, methodGroup)) {
             writer.println("    " + ann);
@@ -581,7 +581,7 @@
         return map;
     }
 
-    private static String generateWarmupAnnotation(Element method, BenchmarkType kind) {
+    private static String generateWarmupAnnotation(Element method, Mode kind) {
         Map<String, String> map = warmupToMap(null, method.getAnnotation(Warmup.class));
         map = warmupToMap(map, method.getEnclosingElement().getAnnotation(Warmup.class));
         if (map != null && !map.isEmpty()) {
@@ -599,7 +599,7 @@
         return map;
     }
 
-    private static String generateMeasurementAnnotation(Element method, BenchmarkType kind) {
+    private static String generateMeasurementAnnotation(Element method, Mode kind) {
         Map<String, String> map = measurementToMap(null, method.getAnnotation(Measurement.class));
         map = measurementToMap(map, method.getEnclosingElement().getAnnotation(Measurement.class));
         if (map != null && !map.isEmpty()) {
@@ -608,8 +608,8 @@
         return null;
     }
 
-    private static String generateThreadsAnnotation(Element method, BenchmarkType kind) {
-        if (kind != BenchmarkType.SingleShotTime) {
+    private static String generateThreadsAnnotation(Element method, Mode kind) {
+        if (kind != Mode.SingleShotTime) {
             Threads tAnnotation = method.getAnnotation(Threads.class);
             if (tAnnotation != null && tAnnotation.value() >= 0) {
                 return "@" + Threads.class.getSimpleName() + "(" + tAnnotation.value() + ")";
@@ -645,7 +645,7 @@
         return map;
     }
 
-    private static String generateForkAnnotation(Element method, BenchmarkType kind) {
+    private static String generateForkAnnotation(Element method, Mode kind) {
         Fork forkAnnotation = method.getAnnotation(Fork.class);
         Fork upperForkAnnotation = method.getEnclosingElement().getAnnotation(Fork.class);
         if (forkAnnotation != null || upperForkAnnotation != null) {
@@ -671,16 +671,16 @@
         return null;
     }
 
-    private static String generateMBAnnotation(BenchmarkType kind) {
+    private static String generateMBAnnotation(Mode kind) {
         StringBuilder sb = new StringBuilder();
         sb.append("@").append(MicroBenchmark.class.getSimpleName());
-        if (kind != BenchmarkType.OpsPerTimeUnit) {
-            sb.append("(BenchmarkType.").append(kind).append(')');
+        if (kind != Mode.OpsPerTimeUnit) {
+            sb.append("(Mode.").append(kind).append(')');
         }
         return sb.toString();
     }
 
-    private List<String> generateMethodAnnotations(BenchmarkType kind, MethodGroup methodGroup) {
+    private List<String> generateMethodAnnotations(Mode kind, MethodGroup methodGroup) {
         int totalThreads = 0;
         String warmupAnn = null;
         String measurementAnn = null;
@@ -715,7 +715,7 @@
         }
     }
 
-    private void generateOpsPerTimeUnit(PrintWriter writer, BenchmarkType benchmarkKind, MethodGroup methodGroup, long opsPerInv, TimeUnit timeUnit, StateObjectHandler states) {
+    private void generateOpsPerTimeUnit(PrintWriter writer, Mode benchmarkKind, MethodGroup methodGroup, long opsPerInv, TimeUnit timeUnit, StateObjectHandler states) {
         writer.println(ident(1) + "public Result " + methodGroup.getName() + "_" + benchmarkKind + "(Loop loop) throws Throwable { ");
         writer.println();
 
@@ -812,7 +812,7 @@
         }
     }
 
-    private void generateAverageTime(PrintWriter writer, BenchmarkType benchmarkKind, MethodGroup methodGroup, long opsPerInv, TimeUnit timeUnit, StateObjectHandler states) {
+    private void generateAverageTime(PrintWriter writer, Mode benchmarkKind, MethodGroup methodGroup, long opsPerInv, TimeUnit timeUnit, StateObjectHandler states) {
         writer.println(ident(1) + "public Result " + methodGroup.getName() + "_" + benchmarkKind + "(Loop loop) throws Throwable { ");
 
         methodProlog(writer, methodGroup);
@@ -925,7 +925,7 @@
         }
     }
 
-    private void generateTimeDistribution(PrintWriter writer, BenchmarkType benchmarkKind, MethodGroup methodGroup, TimeUnit timeUnit, StateObjectHandler states) {
+    private void generateTimeDistribution(PrintWriter writer, Mode benchmarkKind, MethodGroup methodGroup, TimeUnit timeUnit, StateObjectHandler states) {
         writer.println(ident(1) + "public Result " + methodGroup.getName() + "_" + benchmarkKind + "(Loop loop) throws Throwable { ");
         writer.println();
 
@@ -1033,7 +1033,7 @@
         }
     }
 
-    private void generateSingleShot(PrintWriter writer, BenchmarkType benchmarkKind, MethodGroup methodGroup, TimeUnit timeUnit, StateObjectHandler states) {
+    private void generateSingleShot(PrintWriter writer, Mode benchmarkKind, MethodGroup methodGroup, TimeUnit timeUnit, StateObjectHandler states) {
         writer.println(ident(1) + "public Result " + methodGroup.getName() + "_" + benchmarkKind + "(Loop loop) throws Throwable { ");
 
         methodProlog(writer, methodGroup);
--- a/jmh-core/src/main/java/org/openjdk/jmh/processor/internal/MethodGroup.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/processor/internal/MethodGroup.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.processor.internal;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 
 import javax.lang.model.element.Element;
 import java.util.ArrayList;
@@ -36,7 +36,7 @@
     private final String name;
     private final Set<MethodInvocation> methods;
     private boolean strictFP;
-    private BenchmarkType mode;
+    private Mode mode;
 
     MethodGroup(String name) {
         this.name = name;
@@ -106,7 +106,7 @@
         return strictFP;
     }
 
-    public void setMode(BenchmarkType eMode) {
+    public void setMode(Mode eMode) {
         if (mode == null) {
             mode = eMode;
         } else {
@@ -116,7 +116,7 @@
         }
     }
 
-    public BenchmarkType getMode() {
+    public Mode getMode() {
         return mode;
     }
 }
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkRecord.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkRecord.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.runner;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 
 import java.io.Serializable;
 
@@ -32,9 +32,9 @@
 
     private final String userName;
     private final String generatedName;
-    private BenchmarkType mode;
+    private Mode mode;
 
-    private BenchmarkRecord(String userName, String generatedName, BenchmarkType mode) {
+    private BenchmarkRecord(String userName, String generatedName, Mode mode) {
         this.userName = userName;
         this.generatedName = generatedName;
         this.mode = mode;
@@ -49,14 +49,14 @@
 
         this.userName = args[0].trim();
         this.generatedName = args[1].trim();
-        this.mode = BenchmarkType.deepValueOf(args[2].trim());
+        this.mode = Mode.deepValueOf(args[2].trim());
     }
 
     public String toLine() {
         return userName + ", " + generatedName + ", " + mode;
     }
 
-    public BenchmarkRecord cloneWith(BenchmarkType mode) {
+    public BenchmarkRecord cloneWith(Mode mode) {
         return new BenchmarkRecord(userName, generatedName, mode);
     }
 
@@ -70,7 +70,7 @@
         return mode.compareTo(o.mode);
     }
 
-    public String generatedTarget(BenchmarkType type) {
+    public String generatedTarget(Mode type) {
         return generatedName + "_" + type;
     }
 
@@ -92,11 +92,11 @@
         return userName;
     }
 
-    public void setMode(BenchmarkType mode) {
+    public void setMode(Mode mode) {
         this.mode = mode;
     }
 
-    public BenchmarkType getMode() {
+    public Mode getMode() {
         return mode;
     }
 
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/MicroBenchmarkHandlers.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/MicroBenchmarkHandlers.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.runner;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.MicroBenchmark;
 import org.openjdk.jmh.logic.Loop;
 import org.openjdk.jmh.logic.results.Result;
@@ -71,7 +71,7 @@
 
     public static MicroBenchmarkHandler getInstance(OutputFormat outputHandler, BenchmarkRecord microbenchmark, Class<?> clazz, Method method, MicroBenchmarkParameters executionParams, BaseOptions options) {
         MicroBenchmark mb = method.getAnnotation(MicroBenchmark.class);
-        if(mb.value() == BenchmarkType.SingleShotTime) {
+        if(mb.value() == Mode.SingleShotTime) {
             return new ShotMicroBenchmarkHandler(outputHandler, microbenchmark, clazz, method, options, executionParams);
         } else {
             return new LoopMicroBenchmarkHandler(outputHandler, microbenchmark, clazz, method, options, executionParams);
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.runner;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.logic.results.IterationData;
 import org.openjdk.jmh.logic.results.internal.RunResult;
@@ -50,7 +50,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -182,9 +181,9 @@
         // clone with all the modes
         List<BenchmarkRecord> newBenchmarks = new ArrayList<BenchmarkRecord>();
         for (BenchmarkRecord br : benchmarks) {
-            if (br.getMode() == BenchmarkType.All) {
-                for (BenchmarkType mode : BenchmarkType.values()) {
-                    if (mode == BenchmarkType.All) continue;
+            if (br.getMode() == Mode.All) {
+                for (Mode mode : Mode.values()) {
+                    if (mode == Mode.All) continue;
                     newBenchmarks.add(br.cloneWith(mode));
                 }
             } else {
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.runner.options;
 
 import org.kohsuke.args4j.Option;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.profile.ProfilerFactory;
 import org.openjdk.jmh.runner.options.handlers.BenchmarkTypeOptionHandler;
 import org.openjdk.jmh.runner.options.handlers.BooleanOptionHandler;
@@ -82,7 +82,7 @@
     protected TimeValue warmupTime = null;
 
     @Option(name = "-bt", aliases = {"--type"}, metaVar = "TYPE", usage = "Benchmark type", handler = BenchmarkTypeOptionHandler.class)
-    protected BenchmarkType benchType = null;
+    protected Mode benchType = null;
 
     @Option(name = "-t", aliases = {"--threads"}, usage = "Number of threads to run the microbenchmark with. Special value \"max\" or 0 will use Runtime.availableProcessors()", handler = ThreadsOptionHandler.class)
     protected int threads = -1;
@@ -185,7 +185,7 @@
         if (TimeValue.class.equals(t)) {
             return timeValueFieldToString(f);
         }
-        if (BenchmarkType.class.equals(t)) {
+        if (Mode.class.equals(t)) {
             return benchTypeFieldToString(f);
         }
         throw new IllegalArgumentException("Unknown forwarding field type, field="+f.toString());
@@ -296,7 +296,7 @@
     private String benchTypeFieldToString(Field f) {
         try {
             Object value = f.get(this);
-            if (value != null && value instanceof BenchmarkType) {
+            if (value != null && value instanceof Mode) {
                 return f.getAnnotation(Option.class).name() + " " + value;
             } else {
                 return null;
@@ -468,7 +468,7 @@
         return profilers;
     }
 
-    public BenchmarkType getBenchType() {
+    public Mode getBenchType() {
         return benchType;
     }
 }
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/handlers/BenchmarkTypeOptionHandler.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/handlers/BenchmarkTypeOptionHandler.java	Tue Jun 04 13:44:21 2013 +0400
@@ -30,15 +30,12 @@
 import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
-import org.openjdk.jmh.annotations.BenchmarkType;
-
-import java.util.ArrayList;
-import java.util.List;
+import org.openjdk.jmh.annotations.Mode;
 
 /**
- * OptionHandler for BenchmarkType options.
+ * OptionHandler for Mode options.
  */
-public class BenchmarkTypeOptionHandler extends OptionHandler<BenchmarkType> {
+public class BenchmarkTypeOptionHandler extends OptionHandler<Mode> {
 
     /**
      * Constructor
@@ -47,7 +44,7 @@
      * @param option Run-time copy of the Option
      * @param setter Setter to feed back the value
      */
-    public BenchmarkTypeOptionHandler(CmdLineParser parser, OptionDef option, Setter<BenchmarkType> setter) {
+    public BenchmarkTypeOptionHandler(CmdLineParser parser, OptionDef option, Setter<Mode> setter) {
         super(parser, option, setter);
     }
 
@@ -56,7 +53,7 @@
         if (params.size() > 0) {
             String param = params.getParameter(0);
             try {
-                BenchmarkType value = BenchmarkType.deepValueOf(param);
+                Mode value = Mode.deepValueOf(param);
                 setter.addValue(value);
                 return 1;
             } catch (Exception e) {
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/parameters/MicroBenchmarkParametersFactory.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/parameters/MicroBenchmarkParametersFactory.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jmh.runner.parameters;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.MicroBenchmark;
 import org.openjdk.jmh.annotations.Threads;
@@ -86,7 +86,7 @@
     }
 
     private static IterationParams getWarmup(BaseOptions options, Method method) {
-        boolean isSingleShot = method.getAnnotation(MicroBenchmark.class).value() == BenchmarkType.SingleShotTime;
+        boolean isSingleShot = method.getAnnotation(MicroBenchmark.class).value() == Mode.SingleShotTime;
         Warmup warAnn = method.getAnnotation(Warmup.class);
         int iters = (warAnn == null) ? -1 : warAnn.iterations();
         if (isSingleShot) {
@@ -107,7 +107,7 @@
     }
 
     private static IterationParams getMeasurement(BaseOptions options, Method method) {
-        boolean isSingleShot = method.getAnnotation(MicroBenchmark.class).value() == BenchmarkType.SingleShotTime;
+        boolean isSingleShot = method.getAnnotation(MicroBenchmark.class).value() == Mode.SingleShotTime;
         Measurement meAnn = method.getAnnotation(Measurement.class);
         int iters = (meAnn == null) ? -1 : meAnn.iterations();
         if (isSingleShot) {
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 
@@ -58,7 +58,7 @@
 
     @OutputTimeUnit(TimeUnit.SECONDS)
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.OpsPerTimeUnit)
+    @BenchmarkMode(Mode.OpsPerTimeUnit)
     public void measureThroughput() throws InterruptedException {
         TimeUnit.MILLISECONDS.sleep(100);
     }
@@ -71,7 +71,7 @@
 
     @OutputTimeUnit(TimeUnit.MICROSECONDS)
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.AverageTimePerOp)
+    @BenchmarkMode(Mode.AverageTimePerOp)
     public void measureAvgTime() throws InterruptedException {
         TimeUnit.MILLISECONDS.sleep(100);
     }
@@ -88,7 +88,7 @@
      */
     @OutputTimeUnit(TimeUnit.MICROSECONDS)
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.SampleTimePerOp)
+    @BenchmarkMode(Mode.SampleTimePerOp)
     public void measureSamples() throws InterruptedException {
         TimeUnit.MILLISECONDS.sleep(100);
     }
@@ -101,7 +101,7 @@
 
     @OutputTimeUnit(TimeUnit.MICROSECONDS)
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.SingleShotTime)
+    @BenchmarkMode(Mode.SingleShotTime)
     public void measureSingleShot() throws InterruptedException {
         TimeUnit.MILLISECONDS.sleep(100);
     }
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -105,13 +105,13 @@
      */
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.AverageTimePerOp)
+    @BenchmarkMode(Mode.AverageTimePerOp)
     public double measureHot(NormalState e, final Scratch s) throws ExecutionException, InterruptedException {
         return e.service.submit(new Task(s)).get();
     }
 
     @GenerateMicroBenchmark
-    @BenchmarkMode(BenchmarkType.AverageTimePerOp)
+    @BenchmarkMode(Mode.AverageTimePerOp)
     public double measureCold(LaggingState e, final Scratch s) throws ExecutionException, InterruptedException {
         return e.service.submit(new Task(s)).get();
     }
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
@@ -34,7 +34,7 @@
 import java.util.concurrent.TimeUnit;
 
 @State(Scope.Thread)
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class JMHSample_08_DeadCode {
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
@@ -34,7 +34,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @State(Scope.Thread)
 public class JMHSample_09_Blackholes {
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
@@ -34,7 +34,7 @@
 import java.util.concurrent.TimeUnit;
 
 @State(Scope.Thread)
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class JMHSample_10_ConstantFold {
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -35,7 +35,7 @@
 import java.util.concurrent.TimeUnit;
 
 @State(Scope.Thread)
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class JMHSample_11_Loops {
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -35,7 +35,7 @@
 import java.util.concurrent.TimeUnit;
 
 @State(Scope.Thread)
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class JMHSample_12_Forking {
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -36,7 +36,7 @@
 import java.util.concurrent.TimeUnit;
 
 @State(Scope.Thread)
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class JMHSample_13_RunToRun {
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Group;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -38,7 +38,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 @State(Scope.Group)
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class JMHSample_15_Asymmetric {
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.CompilerControl;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -35,7 +35,7 @@
 import java.util.concurrent.TimeUnit;
 
 @State(Scope.Thread)
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class JMHSample_16_CompilerControl {
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_17_SyncIterations.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_17_SyncIterations.java	Tue Jun 04 13:44:21 2013 +0400
@@ -24,7 +24,6 @@
  */
 package org.openjdk.jmh.samples;
 
-import org.openjdk.jmh.annotations.BenchmarkType;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java	Tue Jun 04 13:40:17 2013 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java	Tue Jun 04 13:44:21 2013 +0400
@@ -25,14 +25,14 @@
 package org.openjdk.jmh.samples;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.BenchmarkType;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.logic.BlackHole;
 
 import java.util.concurrent.TimeUnit;
 
-@BenchmarkMode(BenchmarkType.AverageTimePerOp)
+@BenchmarkMode(Mode.AverageTimePerOp)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class JMHSample_21_ConsumeCPU {