diff --git a/build.gradle b/build.gradle
index ceb919c4..e7e9acdc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -233,7 +233,7 @@ subprojects {
 
 project(':verifying') {
     jmh {
-        include = 'verifying.jmhtests.*'
+        include = 'verifying.jmh.*'
     }
 }
 
@@ -243,7 +243,7 @@ project(':understandingcollections') {
         compile project(':collections')
     }
     jmh {
-        include = 'understandingcollections.jmhtests.*'
+        include = 'understandingcollections.jmh.*'
     }
 }
 
diff --git a/understandingcollections/jmhtests/Lists.java b/understandingcollections/jmh/Lists.java
similarity index 95%
rename from understandingcollections/jmhtests/Lists.java
rename to understandingcollections/jmh/Lists.java
index 296164dc..710a5750 100644
--- a/understandingcollections/jmhtests/Lists.java
+++ b/understandingcollections/jmh/Lists.java
@@ -1,9 +1,9 @@
-// understandingcollections/jmhtests/Lists.java
+// understandingcollections/jmh/Lists.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstrates performance differences in Lists
-package understandingcollections.jmhtests;
+package understandingcollections.jmh;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import java.util.*;
diff --git a/understandingcollections/jmhtests/Maps.java b/understandingcollections/jmh/Maps.java
similarity index 95%
rename from understandingcollections/jmhtests/Maps.java
rename to understandingcollections/jmh/Maps.java
index 9a9022b6..99130f4b 100644
--- a/understandingcollections/jmhtests/Maps.java
+++ b/understandingcollections/jmh/Maps.java
@@ -1,9 +1,9 @@
-// understandingcollections/jmhtests/Maps.java
+// understandingcollections/jmh/Maps.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Performance differences between Maps
-package understandingcollections.jmhtests;
+package understandingcollections.jmh;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import java.util.*;
diff --git a/understandingcollections/jmhtests/Queues.java b/understandingcollections/jmh/Queues.java
similarity index 94%
rename from understandingcollections/jmhtests/Queues.java
rename to understandingcollections/jmh/Queues.java
index 1428b07a..6d0c3617 100644
--- a/understandingcollections/jmhtests/Queues.java
+++ b/understandingcollections/jmh/Queues.java
@@ -1,9 +1,9 @@
-// understandingcollections/jmhtests/Queues.java
+// understandingcollections/jmh/Queues.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstrates performance differences in Queues
-package understandingcollections.jmhtests;
+package understandingcollections.jmh;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import java.util.*;
diff --git a/understandingcollections/jmhtests/Sets.java b/understandingcollections/jmh/Sets.java
similarity index 94%
rename from understandingcollections/jmhtests/Sets.java
rename to understandingcollections/jmh/Sets.java
index 3cb94322..085311e0 100644
--- a/understandingcollections/jmhtests/Sets.java
+++ b/understandingcollections/jmh/Sets.java
@@ -1,9 +1,9 @@
-// understandingcollections/jmhtests/Sets.java
+// understandingcollections/jmh/Sets.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstrates performance differences in Sets
-package understandingcollections.jmhtests;
+package understandingcollections.jmh;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import java.util.*;
diff --git a/verifying/jmhtests/ParallelSetAll.java b/verifying/jmh/ParallelSetAll.java
similarity index 88%
rename from verifying/jmhtests/ParallelSetAll.java
rename to verifying/jmh/ParallelSetAll.java
index ddc281fe..c91e3c28 100644
--- a/verifying/jmhtests/ParallelSetAll.java
+++ b/verifying/jmh/ParallelSetAll.java
@@ -1,8 +1,8 @@
-// verifying/jmhtests/ParallelSetAll.java
+// verifying/jmh/ParallelSetAll.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying.jmhtests;
+package verifying.jmh;
 import java.util.*;
 import org.openjdk.jmh.annotations.*;
 
diff --git a/verifying/logback.xml b/verifying/logback.xml
index 6b18546d..73904abb 100644
--- a/verifying/logback.xml
+++ b/verifying/logback.xml
@@ -9,4 +9,4 @@
   <root level="TRACE">
     <appender-ref ref="STDOUT" />
   </root>
-</configuration>
\ No newline at end of file
+</configuration>