diff --git a/src/main/java/org/takes/Request.java b/src/main/java/org/takes/Request.java
index 321518116..80200e005 100644
--- a/src/main/java/org/takes/Request.java
+++ b/src/main/java/org/takes/Request.java
@@ -36,8 +36,8 @@
  *
  * <p>All implementations of this interface must be immutable and thread-safe.
  *
- * @see org.takes.Response
- * @see org.takes.Take
+ * @see Response
+ * @see Take
  * @see org.takes.facets.fork.RqRegex
  * @see org.takes.rq.RqHref
  * @see <a href="http://www.yegor256.com/2015/02/26/composable-decorators.html">
diff --git a/src/main/java/org/takes/Response.java b/src/main/java/org/takes/Response.java
index 32dab334c..929028993 100644
--- a/src/main/java/org/takes/Response.java
+++ b/src/main/java/org/takes/Response.java
@@ -28,7 +28,7 @@
 /**
  * HTTP response.
  *
- * <p>{@link org.takes.Response} interface is an abstraction of a HTTP
+ * <p>{@link Response} interface is an abstraction of a HTTP
  * response, that consists of a few headers and a body. To construct
  * a response, use one of the composable decorators from
  * {@link org.takes.rs} package. For example, this code will create
@@ -50,7 +50,7 @@
  *
  * <p>All implementations of this interface must be immutable and thread-safe.
  *
- * @see org.takes.Take
+ * @see Take
  * @see org.takes.rs.RsWithBody
  * @see org.takes.rs.RsWithHeader
  * @see <a href="http://www.yegor256.com/2015/02/26/composable-decorators.html">
diff --git a/src/main/java/org/takes/Take.java b/src/main/java/org/takes/Take.java
index 68a165e30..ec7cc6926 100644
--- a/src/main/java/org/takes/Take.java
+++ b/src/main/java/org/takes/Take.java
@@ -27,7 +27,7 @@
  * Take.
  *
  * <p>Take is a momentary snapshot of in-server reality, visible to the
- * end user via printable {@link org.takes.Response}.
+ * end user via printable {@link Response}.
  * For example, this is a simple web server
  * that returns "hello, world!" plain text web page:
  *
@@ -42,7 +42,7 @@
  *  ).start(Exit.NEVER);
  * }</pre>
  *
- * <p>There are a few classes that implement this interface and you
+ * <p>There are a few classes that implement this interface, and you
  * can create your own. But the best way is to start with
  * {@link org.takes.facets.fork.TkFork}, for example:
  *
diff --git a/src/main/java/org/takes/tk/TkEmpty.java b/src/main/java/org/takes/tk/TkEmpty.java
index 8cdfbd110..e117fb7c5 100644
--- a/src/main/java/org/takes/tk/TkEmpty.java
+++ b/src/main/java/org/takes/tk/TkEmpty.java
@@ -32,8 +32,7 @@
 /**
  * Empty take.
  *
- * <p>This "take" always returns an instance of
- * {@link org.takes.rs.RsEmpty}.
+ * <p>This "take" always returns an instance of {@link RsEmpty}.
  *
  * <p>The class is immutable and thread-safe.
  *
diff --git a/src/main/java/org/takes/tk/TkFiles.java b/src/main/java/org/takes/tk/TkFiles.java
index c5f6d7e7e..6b842d3dd 100644
--- a/src/main/java/org/takes/tk/TkFiles.java
+++ b/src/main/java/org/takes/tk/TkFiles.java
@@ -46,7 +46,7 @@
  * {@code "/css/style.css?eot"}. {@link TkFiles}
  * will try to find a resource {@code "/tmp/css/style.css"} on disc.
  *
- * <p>If such a resource is not found, {@link org.takes.HttpException}
+ * <p>If such a resource is not found, {@link HttpException}
  * will be thrown.
  *
  * <p>The class is immutable and thread-safe.
diff --git a/src/test/java/org/takes/tk/TkWithHeadersTest.java b/src/test/java/org/takes/tk/TkWithHeadersTest.java
index 2774a3e3e..2c55bca2d 100644
--- a/src/test/java/org/takes/tk/TkWithHeadersTest.java
+++ b/src/test/java/org/takes/tk/TkWithHeadersTest.java
@@ -31,7 +31,7 @@
 import org.takes.rs.RsPrint;
 
 /**
- * Test case for {@link org.takes.tk.TkWithHeaders}.
+ * Test case for {@link TkWithHeaders}.
  * @since 0.9.1
  */
 final class TkWithHeadersTest {