diff --git a/core/src/main/java/com/ibasco/agql/core/transport/DefaultChannlContextFactory.java b/core/src/main/java/com/ibasco/agql/core/transport/DefaultChannelContextFactory.java
similarity index 84%
rename from core/src/main/java/com/ibasco/agql/core/transport/DefaultChannlContextFactory.java
rename to core/src/main/java/com/ibasco/agql/core/transport/DefaultChannelContextFactory.java
index 1d3f98a20d..5a7a28d22b 100644
--- a/core/src/main/java/com/ibasco/agql/core/transport/DefaultChannlContextFactory.java
+++ b/core/src/main/java/com/ibasco/agql/core/transport/DefaultChannelContextFactory.java
@@ -23,21 +23,21 @@
 import io.netty.channel.Channel;
 
 /**
- * <p>DefaultChannlContextFactory class.</p>
+ * <p>DefaultChannelContextFactory class.</p>
  *
  * @author Rafael Luis Ibasco
  */
-public class DefaultChannlContextFactory<M extends NettyMessenger<? extends AbstractRequest, ? extends AbstractResponse>> implements NettyChannelContextFactory {
+public class DefaultChannelContextFactory<M extends NettyMessenger<? extends AbstractRequest, ? extends AbstractResponse>> implements NettyChannelContextFactory {
 
     private final M messenger;
 
     /**
-     * <p>Constructor for DefaultChannlContextFactory.</p>
+     * <p>Constructor for DefaultChannelContextFactory.</p>
      *
      * @param messenger
      *         a M object
      */
-    public DefaultChannlContextFactory(M messenger) {
+    public DefaultChannelContextFactory(M messenger) {
         this.messenger = messenger;
     }
 
diff --git a/protocols/valve/source/query/src/main/java/com/ibasco/agql/protocols/valve/source/query/SourceQueryMessenger.java b/protocols/valve/source/query/src/main/java/com/ibasco/agql/protocols/valve/source/query/SourceQueryMessenger.java
index 4007eb49eb..ca20a5eaba 100644
--- a/protocols/valve/source/query/src/main/java/com/ibasco/agql/protocols/valve/source/query/SourceQueryMessenger.java
+++ b/protocols/valve/source/query/src/main/java/com/ibasco/agql/protocols/valve/source/query/SourceQueryMessenger.java
@@ -24,7 +24,7 @@
 import com.ibasco.agql.core.exceptions.MessengerException;
 import com.ibasco.agql.core.exceptions.RejectedRequestException;
 import com.ibasco.agql.core.exceptions.TimeoutException;
-import com.ibasco.agql.core.transport.DefaultChannlContextFactory;
+import com.ibasco.agql.core.transport.DefaultChannelContextFactory;
 import com.ibasco.agql.core.transport.NettyChannelFactory;
 import com.ibasco.agql.core.transport.NettyContextChannelFactory;
 import com.ibasco.agql.core.transport.NettyPropertyResolver;
@@ -220,7 +220,7 @@ protected void configure(Options options) {
     /** {@inheritDoc} */
     @Override
     protected NettyChannelFactory createChannelFactory() {
-        NettyContextChannelFactory channelFactory = getFactoryProvider().getContextualFactory(TransportType.UDP_CONNLESS, getOptions(), new DefaultChannlContextFactory<>(this));
+        NettyContextChannelFactory channelFactory = getFactoryProvider().getContextualFactory(TransportType.UDP_CONNLESS, getOptions(), new DefaultChannelContextFactory<>(this));
         channelFactory.setResolver(new PropertyResolver(channelFactory.getResolver()));
         return new SourceQueryChannelFactory(channelFactory);
     }
diff --git a/protocols/valve/source/rcon/src/main/java/com/ibasco/agql/protocols/valve/source/query/rcon/SourceRconChannelContextFactory.java b/protocols/valve/source/rcon/src/main/java/com/ibasco/agql/protocols/valve/source/query/rcon/SourceRconChannelContextFactory.java
index 1bf7449c03..5b7ee54f38 100644
--- a/protocols/valve/source/rcon/src/main/java/com/ibasco/agql/protocols/valve/source/query/rcon/SourceRconChannelContextFactory.java
+++ b/protocols/valve/source/rcon/src/main/java/com/ibasco/agql/protocols/valve/source/query/rcon/SourceRconChannelContextFactory.java
@@ -17,7 +17,7 @@
 package com.ibasco.agql.protocols.valve.source.query.rcon;
 
 import com.ibasco.agql.core.NettyChannelContext;
-import com.ibasco.agql.core.transport.DefaultChannlContextFactory;
+import com.ibasco.agql.core.transport.DefaultChannelContextFactory;
 import io.netty.channel.Channel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +27,7 @@
  *
  * @author Rafael Luis Ibasco
  */
-public class SourceRconChannelContextFactory extends DefaultChannlContextFactory<SourceRconMessenger> {
+public class SourceRconChannelContextFactory extends DefaultChannelContextFactory<SourceRconMessenger> {
 
     private static final Logger log = LoggerFactory.getLogger(SourceRconChannelContextFactory.class);
 
diff --git a/protocols/valve/steam/master/src/main/java/com/ibasco/agql/protocols/valve/steam/master/MasterServerChannelContextFactory.java b/protocols/valve/steam/master/src/main/java/com/ibasco/agql/protocols/valve/steam/master/MasterServerChannelContextFactory.java
index 6b9d1510d6..74d83c23db 100644
--- a/protocols/valve/steam/master/src/main/java/com/ibasco/agql/protocols/valve/steam/master/MasterServerChannelContextFactory.java
+++ b/protocols/valve/steam/master/src/main/java/com/ibasco/agql/protocols/valve/steam/master/MasterServerChannelContextFactory.java
@@ -17,7 +17,7 @@
 package com.ibasco.agql.protocols.valve.steam.master;
 
 import com.ibasco.agql.core.NettyChannelContext;
-import com.ibasco.agql.core.transport.DefaultChannlContextFactory;
+import com.ibasco.agql.core.transport.DefaultChannelContextFactory;
 import io.netty.channel.Channel;
 
 /**
@@ -25,7 +25,7 @@
  *
  * @author Rafael Luis Ibasco
  */
-public class MasterServerChannelContextFactory extends DefaultChannlContextFactory<MasterServerMessenger> {
+public class MasterServerChannelContextFactory extends DefaultChannelContextFactory<MasterServerMessenger> {
 
     /**
      * <p>Constructor for MasterServerChannelContextFactory.</p>