diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
index dcadca62b3..ca8aa9a26c 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
@@ -31,7 +31,7 @@ import java.net.SocketAddress;
 import java.nio.channels.DatagramChannel;
 
 /**
- * Provides an NIO based {@link io.netty.channel.socket.DatagramChannel}.
+ * Provides an NIO based {@link org.jboss.netty.channel.socket.DatagramChannel}.
  */
 public final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel>
                                 implements org.jboss.netty.channel.socket.DatagramChannel {
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java
index b1ac2e348b..c8b83d7298 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java
@@ -108,7 +108,7 @@ public class NioDatagramChannelFactory implements DatagramChannelFactory {
     * Creates a new instance.
     *
     * @param workerPool
-    * the {@link WorkerPool} which will be used to obtain the {@link Worker} that execute the I/O worker threads
+    * the {@link WorkerPool} which will be used to obtain the {@link NioDatagramWorker} that execute the I/O worker threads
     */
         public NioDatagramChannelFactory(WorkerPool<NioDatagramWorker> workerPool) {
             this.workerPool = workerPool;
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
index 26cb114ec3..dafbc6cfc7 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
@@ -127,7 +127,7 @@ public class NioServerSocketChannelFactory implements ServerSocketChannelFactory
      * @param bossExecutor
      *        the {@link Executor} which will execute the boss threads
      * @param workerPool
-     *        the {@link WorkerPool} which will be used to obtain the {@link Worker} that execute the I/O worker threads
+     *        the {@link WorkerPool} which will be used to obtain the {@link NioWorker} that execute the I/O worker threads
      */
     public NioServerSocketChannelFactory(
             Executor bossExecutor, WorkerPool<NioWorker> workerPool) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaders.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaders.java
index b0d1988116..09c0843db9 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaders.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaders.java
@@ -28,13 +28,13 @@ import org.jboss.netty.handler.codec.http.HttpVersion;
 /**
  * Provides the constants for the standard SPDY HTTP header names and commonly
  * used utility methods that access an {@link SpdyHeaderBlock}.
- * @apiviz.sterotype static
+ * @apiviz.stereotype static
  */
 public class SpdyHeaders {
 
     /**
      * SPDY HTTP header names
-     * @apiviz.sterotype static
+     * @apiviz.stereotype static
      */
     public static final class HttpNames {
         /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpHeaders.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpHeaders.java
index 803d22e69a..27ac6cde6c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpHeaders.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpHeaders.java
@@ -21,13 +21,13 @@ import org.jboss.netty.handler.codec.http.HttpMessage;
 /**
  * Provides the constants for the header names and the utility methods
  * used by the {@link SpdyHttpDecoder} and {@link SpdyHttpEncoder}.
- * @apiviz.sterotype static
+ * @apiviz.stereotype static
  */
 public final class SpdyHttpHeaders {
 
     /**
      * SPDY HTTP header names
-     * @apiviz.sterotype static
+     * @apiviz.stereotype static
      */
     public static final class Names {
         /**