diff --git a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActiveActive.scala b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActiveActive.scala
index 64bd8b1..9631eb0 100644
--- a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActiveActive.scala
+++ b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActiveActive.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter12
+package com.reactivedesignpatterns.chapter13
 
 import akka.actor._
 import play.api.libs.json.JsValue
diff --git a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActivePassive.scala b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActivePassive.scala
index 3080693..3aee295 100644
--- a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActivePassive.scala
+++ b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActivePassive.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter12
+package com.reactivedesignpatterns.chapter13
 
 import sbt.IO
 import play.api.libs.json._
diff --git a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/KVStoreUtils.scala b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/KVStoreUtils.scala
index a2a44b1..ae3242f 100644
--- a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/KVStoreUtils.scala
+++ b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/KVStoreUtils.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter12
+package com.reactivedesignpatterns.chapter13
 
 import play.api.libs.json.JsValue
 import java.io.File
diff --git a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/MultiMasterCRDT.scala b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/MultiMasterCRDT.scala
index f9fc206..0dae2e6 100644
--- a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/MultiMasterCRDT.scala
+++ b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/MultiMasterCRDT.scala
@@ -1,4 +1,4 @@
-package com.reactivedesignpatterns.chapter12
+package com.reactivedesignpatterns.chapter13
 
 import akka.actor._
 import akka.cluster.ddata._
diff --git a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/RateLimiter.scala b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/RateLimiter.scala
index 269d870..5b51124 100644
--- a/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/RateLimiter.scala
+++ b/chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/RateLimiter.scala
@@ -1,4 +1,4 @@
-package com.reactivedesignpatterns.chapter12
+package com.reactivedesignpatterns.chapter13
 
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.duration.Deadline
diff --git a/chapter13/src/test/scala/com/reactivedesignpatterns/chapter12/MultiMasterCRDTSpec.scala b/chapter13/src/test/scala/com/reactivedesignpatterns/chapter12/MultiMasterCRDTSpec.scala
index b7a20a7..8e331b0 100644
--- a/chapter13/src/test/scala/com/reactivedesignpatterns/chapter12/MultiMasterCRDTSpec.scala
+++ b/chapter13/src/test/scala/com/reactivedesignpatterns/chapter12/MultiMasterCRDTSpec.scala
@@ -1,4 +1,4 @@
-package com.reactivedesignpatterns.chapter12
+package com.reactivedesignpatterns.chapter13
 
 import org.scalatest.WordSpec
 import org.scalatest.Matchers
diff --git a/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ComplexCommand.java b/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ComplexCommand.java
index ed1abd3..793ab18 100644
--- a/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ComplexCommand.java
+++ b/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ComplexCommand.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter13;
+package com.reactivedesignpatterns.chapter14;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ComplexCommandTest.java b/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ComplexCommandTest.java
index 818aac0..2bf5f2e 100644
--- a/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ComplexCommandTest.java
+++ b/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ComplexCommandTest.java
@@ -1,14 +1,14 @@
-package com.reactivedesignpatterns.chapter13;
+package com.reactivedesignpatterns.chapter14;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Scanner;
 
-import com.reactivedesignpatterns.chapter13.ComplexCommand.*;
+import com.reactivedesignpatterns.chapter14.ComplexCommand.*;
 
 public class ComplexCommandTest {
 	public static void main(String[] args) throws IOException {
-		try (InputStream js = ComplexCommandTest.class.getResourceAsStream("/com/reactivedesignpatterns/chapter13/job.js");
+		try (InputStream js = ComplexCommandTest.class.getResourceAsStream("/com/reactivedesignpatterns/chapter14/job.js");
 				Scanner s = new Scanner(js, "UTF-8")) {
 			s.useDelimiter("\\A");
 			final BatchJobJS job = new BatchJobJS("", s.next(), "");
diff --git a/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ManagedBlocking.java b/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ManagedBlocking.java
index 0411882..7ff6aa3 100644
--- a/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ManagedBlocking.java
+++ b/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ManagedBlocking.java
@@ -1,4 +1,4 @@
-package com.reactivedesignpatterns.chapter13;
+package com.reactivedesignpatterns.chapter14;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
diff --git a/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ResourceEncapsulation.java b/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ResourceEncapsulation.java
index c71a44b..7f95ab8 100644
--- a/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ResourceEncapsulation.java
+++ b/chapter14/src/main/java/com/reactivedesignpatterns/chapter14/ResourceEncapsulation.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter13;
+package com.reactivedesignpatterns.chapter14;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
diff --git a/chapter15/src/main/java/com/reactivedesignpatterns/chapter15/RequestResponse.java b/chapter15/src/main/java/com/reactivedesignpatterns/chapter15/RequestResponse.java
index e7d1104..087d8e4 100644
--- a/chapter15/src/main/java/com/reactivedesignpatterns/chapter15/RequestResponse.java
+++ b/chapter15/src/main/java/com/reactivedesignpatterns/chapter15/RequestResponse.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter14;
+package com.reactivedesignpatterns.chapter15;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/Aggregator.scala b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/Aggregator.scala
index 7affa47..9301216 100644
--- a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/Aggregator.scala
+++ b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/Aggregator.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter14
+package com.reactivedesignpatterns.chapter15
 
 import akka.typed._
 import akka.typed.ScalaDSL._
diff --git a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/AskPattern.scala b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/AskPattern.scala
index 07c44ff..c05a825 100644
--- a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/AskPattern.scala
+++ b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/AskPattern.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter14
+package com.reactivedesignpatterns.chapter15
 
 import akka.typed._
 import akka.typed.ScalaDSL._
diff --git a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/BusinessHandshake.scala b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/BusinessHandshake.scala
index 8f48d62..2492183 100644
--- a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/BusinessHandshake.scala
+++ b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/BusinessHandshake.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter14
+package com.reactivedesignpatterns.chapter15
 
 import akka.actor._
 import akka.persistence._
diff --git a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/RequestResponseActors.scala b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/RequestResponseActors.scala
index 8877b44..58e4a42 100644
--- a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/RequestResponseActors.scala
+++ b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/RequestResponseActors.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter14
+package com.reactivedesignpatterns.chapter15
 
 import akka.actor._
 
diff --git a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/RequestResponseTypedActors.scala b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/RequestResponseTypedActors.scala
index 72b4e2a..35d9257 100644
--- a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/RequestResponseTypedActors.scala
+++ b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/RequestResponseTypedActors.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter14
+package com.reactivedesignpatterns.chapter15
 
 import akka.typed._
 import akka.typed.ScalaDSL._
diff --git a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/Saga.scala b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/Saga.scala
index 7928ac5..252fabf 100644
--- a/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/Saga.scala
+++ b/chapter15/src/main/scala/com/reactivedesignpatterns/chapter15/Saga.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter14
+package com.reactivedesignpatterns.chapter15
 
 import akka.actor._
 import akka.persistence.PersistentActor
diff --git a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/DropPattern.scala b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/DropPattern.scala
index 1a5191f..2645ce5 100644
--- a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/DropPattern.scala
+++ b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/DropPattern.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter15
+package com.reactivedesignpatterns.chapter16
 
 import java.math.MathContext
 import java.math.RoundingMode
diff --git a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/DropPatternWithProtection.scala b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/DropPatternWithProtection.scala
index 438c5b0..1ce1504 100644
--- a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/DropPatternWithProtection.scala
+++ b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/DropPatternWithProtection.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter15
+package com.reactivedesignpatterns.chapter16
 
 import java.math.MathContext
 import java.math.RoundingMode
diff --git a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/PullPattern.scala b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/PullPattern.scala
index 3ee0e09..87aeb98 100644
--- a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/PullPattern.scala
+++ b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/PullPattern.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter15
+package com.reactivedesignpatterns.chapter16
 
 import java.math.MathContext
 import java.math.RoundingMode
diff --git a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/QueuePattern.scala b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/QueuePattern.scala
index c901797..fcd5b82 100644
--- a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/QueuePattern.scala
+++ b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/QueuePattern.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter15
+package com.reactivedesignpatterns.chapter16
 
 import java.math.MathContext
 import java.math.RoundingMode
diff --git a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/ThrottlingPattern.scala b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/ThrottlingPattern.scala
index ddd1175..14340b1 100644
--- a/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/ThrottlingPattern.scala
+++ b/chapter16/src/main/scala/com/reactivedesignpatterns/chapter16/ThrottlingPattern.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter15
+package com.reactivedesignpatterns.chapter16
 
 import java.math.MathContext
 import java.math.RoundingMode
diff --git a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/CommandsAndQueries.scala b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/CommandsAndQueries.scala
index 69f0106..3ee83c1 100644
--- a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/CommandsAndQueries.scala
+++ b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/CommandsAndQueries.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter16
+package com.reactivedesignpatterns.chapter17
 
 trait ShoppingCartMessage {
   def shoppingCart: ShoppingCartRef
diff --git a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/DomainObject.scala b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/DomainObject.scala
index 8f987d4..93ae0d1 100644
--- a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/DomainObject.scala
+++ b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/DomainObject.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter16
+package com.reactivedesignpatterns.chapter17
 
 import java.net.URI
 
diff --git a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventSourcing.scala b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventSourcing.scala
index c000d30..eb45c6d 100644
--- a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventSourcing.scala
+++ b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventSourcing.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter16
+package com.reactivedesignpatterns.chapter17
 
 import akka.persistence.PersistentActor
 import akka.actor._
diff --git a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventStream.scala b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventStream.scala
index 3161f44..ec99476 100644
--- a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventStream.scala
+++ b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventStream.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter16
+package com.reactivedesignpatterns.chapter17
 
 import akka.actor._
 import akka.stream._
@@ -121,10 +121,10 @@ akka.persistence.journal {
   leveldb {
     native = off
     event-adapters {
-      tagging = "com.reactivedesignpatterns.chapter16.ShoppingCartTagging"
+      tagging = "com.reactivedesignpatterns.chapter17.ShoppingCartTagging"
     }
     event-adapter-bindings {
-      "com.reactivedesignpatterns.chapter16.ShoppingCartMessage" = tagging
+      "com.reactivedesignpatterns.chapter17.ShoppingCartMessage" = tagging
     }
   }
 }
diff --git a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventsAndResults.scala b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventsAndResults.scala
index cc605ba..da4befe 100644
--- a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventsAndResults.scala
+++ b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/EventsAndResults.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter16
+package com.reactivedesignpatterns.chapter17
 
 sealed trait Event extends ShoppingCartMessage
 case class OwnerChanged(shoppingCart: ShoppingCartRef, owner: CustomerRef) extends Event
diff --git a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/ObjectManager.scala b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/ObjectManager.scala
index b92269e..bd4bb9f 100644
--- a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/ObjectManager.scala
+++ b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/ObjectManager.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter16
+package com.reactivedesignpatterns.chapter17
 
 import java.net.URI
 import java.util.UUID
diff --git a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/Sharding.scala b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/Sharding.scala
index ccf7c6b..9142b9a 100644
--- a/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/Sharding.scala
+++ b/chapter17/src/main/scala/com/reactivedesignpatterns/chapter17/Sharding.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2015 Roland Kuhn <http://rolandkuhn.com>
  */
-package com.reactivedesignpatterns.chapter16
+package com.reactivedesignpatterns.chapter17
 
 import com.typesafe.config.ConfigFactory
 import akka.actor._