diff --git a/HelloDate.java b/HelloDate.java
deleted file mode 100644
index 9b14605b..00000000
--- a/HelloDate.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// HelloDate.java
-// (c)2016 MindView LLC: see Copyright.txt
-// We make no guarantees that this code is fit for any purpose.
-// Visit http://OnJava8.com for more book information.
-import java.util.*;
-
-public class HelloDate {
-  public static void main(String[] args) {
-    System.out.println("Hello, it's: ");
-    System.out.println(new Date());
-  }
-}
diff --git a/arrays/IceCream.java b/arrays/IceCreamFlavors.java
similarity index 95%
rename from arrays/IceCream.java
rename to arrays/IceCreamFlavors.java
index c47e3afb..bcc1b394 100644
--- a/arrays/IceCream.java
+++ b/arrays/IceCreamFlavors.java
@@ -1,4 +1,4 @@
-// arrays/IceCream.java
+// arrays/IceCreamFlavors.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://OnJava8.com for more book information.
@@ -6,7 +6,7 @@
 import java.util.*;
 import static onjava.ArrayShow.*;
 
-public class IceCream {
+public class IceCreamFlavors {
   private static SplittableRandom rand =
     new SplittableRandom(47);
   static final String[] FLAVORS = {
diff --git a/collections/CollectionMethods.java b/collections/CollectionDifferences.java
similarity index 97%
rename from collections/CollectionMethods.java
rename to collections/CollectionDifferences.java
index 0a6986cf..4ace6ad8 100644
--- a/collections/CollectionMethods.java
+++ b/collections/CollectionDifferences.java
@@ -1,10 +1,10 @@
-// collections/CollectionMethods.java
+// collections/CollectionDifferences.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://OnJava8.com for more book information.
 import onjava.*;
 
-public class CollectionMethods {
+public class CollectionDifferences {
   public static void main(String[] args) {
     CollectionMethodDifferences.main(args);
   }
diff --git a/concurrent/CollectionToStream.java b/concurrent/CollectionIntoStream.java
similarity index 91%
rename from concurrent/CollectionToStream.java
rename to concurrent/CollectionIntoStream.java
index fe188adf..b666f15a 100644
--- a/concurrent/CollectionToStream.java
+++ b/concurrent/CollectionIntoStream.java
@@ -1,4 +1,4 @@
-// concurrent/CollectionToStream.java
+// concurrent/CollectionIntoStream.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://OnJava8.com for more book information.
@@ -6,7 +6,7 @@ import onjava.*;
 import java.util.*;
 import java.util.stream.*;
 
-public class CollectionToStream {
+public class CollectionIntoStream {
   public static void main(String[] args) {
     List<String> strings =
       Stream.generate(new Rand.String(5))
diff --git a/network/tests/ChatterTest.java b/network/tests/ChatterTest.java
index 97de353c..b72c31d1 100644
--- a/network/tests/ChatterTest.java
+++ b/network/tests/ChatterTest.java
@@ -13,7 +13,7 @@ public class ChatterTest {
   }
   @Test
   void chatterTest() throws Exception {
-    // <* These need to be handed to an executor: *>
+    // <* These must be handed to an executor: *>
     new ChatterServer();
     new ChatterClient(InetAddress.getLocalHost());
     // No exceptions means success
diff --git a/objects/HelloDate.java b/objects/HelloDate.java
index 73530bb3..43536125 100644
--- a/objects/HelloDate.java
+++ b/objects/HelloDate.java
@@ -4,23 +4,9 @@
 // Visit http://OnJava8.com for more book information.
 import java.util.*;
 
-/** The first On Java example program.
- * Displays a String and today's date.
- * @author Bruce Eckel
- * @author www.MindviewInc.com
- * @version 5.0
- */
 public class HelloDate {
-  /** Entry point to class & application.
-   * @param args array of String arguments
-   * @throws exceptions No exceptions thrown
-   */
   public static void main(String[] args) {
     System.out.println("Hello, it's: ");
     System.out.println(new Date());
   }
 }
-/* Output:
-Hello, it's:
-Wed Jul 27 10:50:45 MDT 2016
-*/
diff --git a/objects/HelloDateDoc.java b/objects/HelloDateDoc.java
new file mode 100644
index 00000000..0f7ee4f6
--- /dev/null
+++ b/objects/HelloDateDoc.java
@@ -0,0 +1,26 @@
+// objects/HelloDateDoc.java
+// (c)2016 MindView LLC: see Copyright.txt
+// We make no guarantees that this code is fit for any purpose.
+// Visit http://OnJava8.com for more book information.
+import java.util.*;
+
+/** The first On Java 8 example program.
+ * Displays a String and today's date.
+ * @author Bruce Eckel
+ * @author www.MindviewInc.com
+ * @version 5.0
+ */
+public class HelloDateDoc {
+  /** Entry point to class & application.
+   * @param args array of String arguments
+   * @throws exceptions No exceptions thrown
+   */
+  public static void main(String[] args) {
+    System.out.println("Hello, it's: ");
+    System.out.println(new Date());
+  }
+}
+/* Output:
+Hello, it's:
+Wed Jul 27 10:50:45 MDT 2016
+*/