diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java
index d2285b67..740fa77e 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java
@@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory;
  * that is unknown to acme4j.
  * <p>
  * Subclasses must override {@link Challenge#acceptable(String)} so it only accepts the
- * own type. {@link Challenge#respond(JSONBuilder)} should be overridden to put all
- * required data to the response.
+ * own type. {@link Challenge#prepareResponse(JSONBuilder)} should be overridden to put
+ * all required data to the response.
  */
 public class Challenge extends AcmeJsonResource {
     private static final long serialVersionUID = 2338794776848388099L;
@@ -142,10 +142,10 @@ public class Challenge extends AcmeJsonResource {
     /**
      * Exports the response state, as preparation for triggering the challenge.
      *
-     * @param cb
-     *            {@link JSONBuilder} to copy the response to
+     * @param response
+     *            {@link JSONBuilder} to write the response to
      */
-    protected void respond(JSONBuilder cb) {
+    protected void prepareResponse(JSONBuilder response) {
         // Do nothing here...
     }
 
@@ -185,7 +185,7 @@ public class Challenge extends AcmeJsonResource {
         LOG.debug("trigger");
         try (Connection conn = getSession().provider().connect()) {
             JSONBuilder claims = new JSONBuilder();
-            respond(claims);
+            prepareResponse(claims);
 
             conn.sendSignedRequest(getLocation(), claims, getSession());
 
diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java
index 2b8641bc..c32f986c 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java
@@ -47,9 +47,9 @@ public class TokenChallenge extends Challenge {
     }
 
     @Override
-    protected void respond(JSONBuilder cb) {
-        super.respond(cb);
-        cb.put(KEY_KEY_AUTHORIZATION, getAuthorization());
+    protected void prepareResponse(JSONBuilder response) {
+        super.prepareResponse(response);
+        response.put(KEY_KEY_AUTHORIZATION, getAuthorization());
     }
 
     /**
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java
index f8c0ea5b..a9acca4c 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java
@@ -120,16 +120,16 @@ public class ChallengeTest {
     }
 
     /**
-     * Test that {@link Challenge#respond(JSONBuilder)} contains the type.
+     * Test that {@link Challenge#prepareResponse(JSONBuilder)} contains the type.
      */
     @Test
     public void testRespond() throws JoseException {
         Challenge challenge = new Challenge(session, getJSON("genericChallenge"));
 
-        JSONBuilder cb = new JSONBuilder();
-        challenge.respond(cb);
+        JSONBuilder response = new JSONBuilder();
+        challenge.prepareResponse(response);
 
-        assertThat(cb.toString(), sameJSONAs("{}"));
+        assertThat(response.toString(), sameJSONAs("{}"));
     }
 
     /**
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java
index b75b8e10..d541c5b2 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java
@@ -52,10 +52,10 @@ public class DnsChallengeTest {
         assertThat(challenge.getStatus(), is(Status.PENDING));
         assertThat(challenge.getDigest(), is("rzMmotrIgsithyBYc0vgiLUEEKYx0WetQRgEF2JIozA"));
 
-        JSONBuilder cb = new JSONBuilder();
-        challenge.respond(cb);
+        JSONBuilder response = new JSONBuilder();
+        challenge.prepareResponse(response);
 
-        assertThat(cb.toString(), sameJSONAs("{\"keyAuthorization\"=\""
+        assertThat(response.toString(), sameJSONAs("{\"keyAuthorization\"=\""
             + KEY_AUTHORIZATION + "\"}").allowingExtraUnexpectedFields());
     }
 
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java
index 3b784e39..63275fa6 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java
@@ -56,10 +56,10 @@ public class HttpChallengeTest {
         assertThat(challenge.getToken(), is(TOKEN));
         assertThat(challenge.getAuthorization(), is(KEY_AUTHORIZATION));
 
-        JSONBuilder cb = new JSONBuilder();
-        challenge.respond(cb);
+        JSONBuilder response = new JSONBuilder();
+        challenge.prepareResponse(response);
 
-        assertThat(cb.toString(), sameJSONAs("{\"keyAuthorization\"=\""
+        assertThat(response.toString(), sameJSONAs("{\"keyAuthorization\"=\""
             + KEY_AUTHORIZATION + "\"}").allowingExtraUnexpectedFields());
     }
 
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java
index 490775c4..82fd1b90 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java
@@ -53,10 +53,10 @@ public class TlsSni02ChallengeTest {
         assertThat(challenge.getSubject(), is("5bf0b9908ed73bc53ed3327afa52f76b.0a4bea00520f0753f42abe0bb39e3ea8.token.acme.invalid"));
         assertThat(challenge.getSanB(), is("14e2350a04434f93c2e0b6012968d99d.ed459b6a7a019d9695609b8514f9d63d.ka.acme.invalid"));
 
-        JSONBuilder cb = new JSONBuilder();
-        challenge.respond(cb);
+        JSONBuilder response = new JSONBuilder();
+        challenge.prepareResponse(response);
 
-        assertThat(cb.toString(), sameJSONAs("{\"keyAuthorization\"=\""
+        assertThat(response.toString(), sameJSONAs("{\"keyAuthorization\"=\""
             + KEY_AUTHORIZATION + "\"}").allowingExtraUnexpectedFields());
     }