diff --git a/.gitignore b/.gitignore
index ef3f68cf6..891628c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,11 +14,9 @@ out
 *.iws
 .vertx
 test-output
-Scratch.java
-ScratchTest.java
+src/test/java/io/vertx/test/scratchpad
 test-results
 test-tmp
 *.class
-ScratchPad.java
 *.swp
 .vertx
diff --git a/src/main/java/io/vertx/core/http/HttpClientRequest.java b/src/main/java/io/vertx/core/http/HttpClientRequest.java
index 86b63f622..af4ca2ebd 100644
--- a/src/main/java/io/vertx/core/http/HttpClientRequest.java
+++ b/src/main/java/io/vertx/core/http/HttpClientRequest.java
@@ -196,7 +196,7 @@ public interface HttpClientRequest extends WriteStream<Buffer> {
   /**
     * Set's the amount of time after which if a response is not received TimeoutException()
     * will be sent to the exception handler of this request. Calling this method more than once
-    * has the effect of canceling any existing timeout and starting the timeout from scratch.
+    * has the effect of canceling any existing timeout and starting the timeout from scratchpad.
     *
     * @param timeoutMs The quantity of time in milliseconds.
     * @return A reference to this, so multiple method calls can be chained.