diff --git a/src/main/java/com/flowpowered/network/AsyncableMessage.java b/src/main/java/com/flowpowered/network/AsyncableMessage.java
index d0885bb..e989ee4 100644
--- a/src/main/java/com/flowpowered/network/AsyncableMessage.java
+++ b/src/main/java/com/flowpowered/network/AsyncableMessage.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking;
+package com.flowpowered.network;
 
 public interface AsyncableMessage extends Message {
     /**
diff --git a/src/main/java/com/flowpowered/network/BasicChannelInitializer.java b/src/main/java/com/flowpowered/network/BasicChannelInitializer.java
index 927993d..7014097 100644
--- a/src/main/java/com/flowpowered/network/BasicChannelInitializer.java
+++ b/src/main/java/com/flowpowered/network/BasicChannelInitializer.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,16 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking;
+package com.flowpowered.network;
 
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 
-import com.flowpowered.networking.pipeline.MessageDecoder;
-import com.flowpowered.networking.pipeline.MessageEncoder;
-import com.flowpowered.networking.pipeline.MessageHandler;
-import com.flowpowered.networking.pipeline.MessageProcessorDecoder;
-import com.flowpowered.networking.pipeline.MessageProcessorEncoder;
+import com.flowpowered.network.pipeline.MessageDecoder;
+import com.flowpowered.network.pipeline.MessageEncoder;
+import com.flowpowered.network.pipeline.MessageHandler;
+import com.flowpowered.network.pipeline.MessageProcessorDecoder;
+import com.flowpowered.network.pipeline.MessageProcessorEncoder;
 
 /**
  * Used to initialize the channels.
diff --git a/src/main/java/com/flowpowered/network/Codec.java b/src/main/java/com/flowpowered/network/Codec.java
index 018ec3a..7463602 100644
--- a/src/main/java/com/flowpowered/network/Codec.java
+++ b/src/main/java/com/flowpowered/network/Codec.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking;
+package com.flowpowered.network;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/src/main/java/com/flowpowered/network/ConnectionManager.java b/src/main/java/com/flowpowered/network/ConnectionManager.java
index 80d2df9..7c8a3b8 100644
--- a/src/main/java/com/flowpowered/network/ConnectionManager.java
+++ b/src/main/java/com/flowpowered/network/ConnectionManager.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking;
+package com.flowpowered.network;
 
 import io.netty.channel.Channel;
 
-import com.flowpowered.networking.session.Session;
+import com.flowpowered.network.session.Session;
 
 /**
  * This class defines a basic structure for any object which manages connections.
diff --git a/src/main/java/com/flowpowered/network/Message.java b/src/main/java/com/flowpowered/network/Message.java
index a8d1b81..d77a183 100644
--- a/src/main/java/com/flowpowered/network/Message.java
+++ b/src/main/java/com/flowpowered/network/Message.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking;
+package com.flowpowered.network;
 
 /**
  * Implementers of this class represent the data of a message to be sent.
diff --git a/src/main/java/com/flowpowered/network/MessageHandler.java b/src/main/java/com/flowpowered/network/MessageHandler.java
index 782a49f..3f129e9 100644
--- a/src/main/java/com/flowpowered/network/MessageHandler.java
+++ b/src/main/java/com/flowpowered/network/MessageHandler.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking;
+package com.flowpowered.network;
 
-import com.flowpowered.networking.session.Session;
+import com.flowpowered.network.session.Session;
 
 /**
  * Defines a class which handles a message of type {@code T}.
diff --git a/src/main/java/com/flowpowered/network/NetworkClient.java b/src/main/java/com/flowpowered/network/NetworkClient.java
index 3faa7ae..09324da 100644
--- a/src/main/java/com/flowpowered/network/NetworkClient.java
+++ b/src/main/java/com/flowpowered/network/NetworkClient.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking;
+package com.flowpowered.network;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/com/flowpowered/network/NetworkServer.java b/src/main/java/com/flowpowered/network/NetworkServer.java
index 5dc3e41..cfe726a 100644
--- a/src/main/java/com/flowpowered/network/NetworkServer.java
+++ b/src/main/java/com/flowpowered/network/NetworkServer.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking;
+package com.flowpowered.network;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
diff --git a/src/main/java/com/flowpowered/network/exception/ChannelClosedException.java b/src/main/java/com/flowpowered/network/exception/ChannelClosedException.java
index 88a91d6..5396b98 100644
--- a/src/main/java/com/flowpowered/network/exception/ChannelClosedException.java
+++ b/src/main/java/com/flowpowered/network/exception/ChannelClosedException.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.exception;
+package com.flowpowered.network.exception;
 
 public class ChannelClosedException extends RuntimeException {
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/flowpowered/network/exception/IllegalOpcodeException.java b/src/main/java/com/flowpowered/network/exception/IllegalOpcodeException.java
index 795a834..93dab94 100644
--- a/src/main/java/com/flowpowered/network/exception/IllegalOpcodeException.java
+++ b/src/main/java/com/flowpowered/network/exception/IllegalOpcodeException.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.exception;
+package com.flowpowered.network.exception;
 
 public class IllegalOpcodeException extends Exception {
 
diff --git a/src/main/java/com/flowpowered/network/exception/UnknownPacketException.java b/src/main/java/com/flowpowered/network/exception/UnknownPacketException.java
index 9218a75..4fad879 100644
--- a/src/main/java/com/flowpowered/network/exception/UnknownPacketException.java
+++ b/src/main/java/com/flowpowered/network/exception/UnknownPacketException.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.exception;
+package com.flowpowered.network.exception;
 
 /**
- * Thrown when a {@link com.flowpowered.networking.Codec} cannot be found for a given opcode and key.
+ * Thrown when a {@link com.flowpowered.network.Codec} cannot be found for a given opcode and key.
  */
 public class UnknownPacketException extends Exception {
     private static final long serialVersionUID = 2479966238464122702L;
diff --git a/src/main/java/com/flowpowered/network/pipeline/MessageDecoder.java b/src/main/java/com/flowpowered/network/pipeline/MessageDecoder.java
index 5b9d087..b3b79db 100644
--- a/src/main/java/com/flowpowered/network/pipeline/MessageDecoder.java
+++ b/src/main/java/com/flowpowered/network/pipeline/MessageDecoder.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.pipeline;
+package com.flowpowered.network.pipeline;
 
 import java.util.List;
 
@@ -29,10 +29,10 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ReplayingDecoder;
 
-import com.flowpowered.networking.Codec;
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.exception.UnknownPacketException;
-import com.flowpowered.networking.protocol.Protocol;
+import com.flowpowered.network.Codec;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.exception.UnknownPacketException;
+import com.flowpowered.network.protocol.Protocol;
 
 /**
  * A {@link ReplayingDecoder} which decodes {@link ByteBuf}s into {@link Message}s.
diff --git a/src/main/java/com/flowpowered/network/pipeline/MessageEncoder.java b/src/main/java/com/flowpowered/network/pipeline/MessageEncoder.java
index 9af9388..2c01349 100644
--- a/src/main/java/com/flowpowered/network/pipeline/MessageEncoder.java
+++ b/src/main/java/com/flowpowered/network/pipeline/MessageEncoder.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.pipeline;
+package com.flowpowered.network.pipeline;
 
 import java.io.IOException;
 import java.util.List;
@@ -31,9 +31,9 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
 
-import com.flowpowered.networking.Codec.CodecRegistration;
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.protocol.Protocol;
+import com.flowpowered.network.Codec.CodecRegistration;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.protocol.Protocol;
 
 /**
  * A {@link MessageToMessageEncoder} which encodes into {@link ByteBuf}s.
diff --git a/src/main/java/com/flowpowered/network/pipeline/MessageHandler.java b/src/main/java/com/flowpowered/network/pipeline/MessageHandler.java
index 9e6f860..c859d7e 100644
--- a/src/main/java/com/flowpowered/network/pipeline/MessageHandler.java
+++ b/src/main/java/com/flowpowered/network/pipeline/MessageHandler.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.pipeline;
+package com.flowpowered.network.pipeline;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -32,9 +32,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.flowpowered.networking.ConnectionManager;
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.session.Session;
+import com.flowpowered.network.ConnectionManager;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.session.Session;
 
 /**
  * A {@link SimpleChannelUpstreamHandler} which processes incoming network events.
diff --git a/src/main/java/com/flowpowered/network/pipeline/MessageProcessorDecoder.java b/src/main/java/com/flowpowered/network/pipeline/MessageProcessorDecoder.java
index ca18b22..acc4930 100644
--- a/src/main/java/com/flowpowered/network/pipeline/MessageProcessorDecoder.java
+++ b/src/main/java/com/flowpowered/network/pipeline/MessageProcessorDecoder.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.pipeline;
+package com.flowpowered.network.pipeline;
 
 import java.util.List;
 
-import com.flowpowered.networking.processor.MessageProcessor;
+import com.flowpowered.network.processor.MessageProcessor;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/flowpowered/network/pipeline/MessageProcessorEncoder.java b/src/main/java/com/flowpowered/network/pipeline/MessageProcessorEncoder.java
index 394c4c1..1041996 100644
--- a/src/main/java/com/flowpowered/network/pipeline/MessageProcessorEncoder.java
+++ b/src/main/java/com/flowpowered/network/pipeline/MessageProcessorEncoder.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.pipeline;
+package com.flowpowered.network.pipeline;
 
 import java.util.List;
 
@@ -29,7 +29,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
 
-import com.flowpowered.networking.processor.MessageProcessor;
+import com.flowpowered.network.processor.MessageProcessor;
 
 /**
  * This class provides a layer of processing after encode but before the message is passed outbound.
diff --git a/src/main/java/com/flowpowered/network/processor/MessageProcessor.java b/src/main/java/com/flowpowered/network/processor/MessageProcessor.java
index 7329285..dbc128f 100644
--- a/src/main/java/com/flowpowered/network/processor/MessageProcessor.java
+++ b/src/main/java/com/flowpowered/network/processor/MessageProcessor.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.processor;
+package com.flowpowered.network.processor;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/flowpowered/network/processor/simple/SimpleMessageProcessor.java b/src/main/java/com/flowpowered/network/processor/simple/SimpleMessageProcessor.java
index 9fddd12..64950fd 100644
--- a/src/main/java/com/flowpowered/network/processor/simple/SimpleMessageProcessor.java
+++ b/src/main/java/com/flowpowered/network/processor/simple/SimpleMessageProcessor.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.processor.simple;
+package com.flowpowered.network.processor.simple;
 
-import com.flowpowered.networking.processor.MessageProcessor;
+import com.flowpowered.network.processor.MessageProcessor;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 
diff --git a/src/main/java/com/flowpowered/network/protocol/AbstractProtocol.java b/src/main/java/com/flowpowered/network/protocol/AbstractProtocol.java
index 886331f..412c7b7 100644
--- a/src/main/java/com/flowpowered/network/protocol/AbstractProtocol.java
+++ b/src/main/java/com/flowpowered/network/protocol/AbstractProtocol.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,15 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.protocol;
+package com.flowpowered.network.protocol;
 
 import java.io.IOException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.MessageHandler;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.MessageHandler;
 
 /**
  * A {@code AbstractProtocol} stores to what port the protocol should be bound to.
diff --git a/src/main/java/com/flowpowered/network/protocol/Protocol.java b/src/main/java/com/flowpowered/network/protocol/Protocol.java
index 04cf548..28c2925 100644
--- a/src/main/java/com/flowpowered/network/protocol/Protocol.java
+++ b/src/main/java/com/flowpowered/network/protocol/Protocol.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.protocol;
+package com.flowpowered.network.protocol;
 
-import com.flowpowered.networking.Codec;
-import com.flowpowered.networking.Codec.CodecRegistration;
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.exception.UnknownPacketException;
+import com.flowpowered.network.Codec;
+import com.flowpowered.network.Codec.CodecRegistration;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.exception.UnknownPacketException;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/src/main/java/com/flowpowered/network/protocol/ProtocolRegistry.java b/src/main/java/com/flowpowered/network/protocol/ProtocolRegistry.java
index 1414b21..763ba7f 100644
--- a/src/main/java/com/flowpowered/network/protocol/ProtocolRegistry.java
+++ b/src/main/java/com/flowpowered/network/protocol/ProtocolRegistry.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.protocol;
+package com.flowpowered.network.protocol;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
diff --git a/src/main/java/com/flowpowered/network/protocol/keyed/KeyedProtocol.java b/src/main/java/com/flowpowered/network/protocol/keyed/KeyedProtocol.java
index ed8736e..2303022 100644
--- a/src/main/java/com/flowpowered/network/protocol/keyed/KeyedProtocol.java
+++ b/src/main/java/com/flowpowered/network/protocol/keyed/KeyedProtocol.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,19 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.protocol.keyed;
+package com.flowpowered.network.protocol.keyed;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.flowpowered.networking.Codec;
-import com.flowpowered.networking.Codec.CodecRegistration;
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.MessageHandler;
-import com.flowpowered.networking.protocol.AbstractProtocol;
-import com.flowpowered.networking.service.CodecLookupService;
-import com.flowpowered.networking.service.HandlerLookupService;
+import com.flowpowered.network.Codec;
+import com.flowpowered.network.Codec.CodecRegistration;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.MessageHandler;
+import com.flowpowered.network.protocol.AbstractProtocol;
+import com.flowpowered.network.service.CodecLookupService;
+import com.flowpowered.network.service.HandlerLookupService;
 
 import org.slf4j.Logger;
 
diff --git a/src/main/java/com/flowpowered/network/protocol/simple/SimpleProtocol.java b/src/main/java/com/flowpowered/network/protocol/simple/SimpleProtocol.java
index cdec55c..9583a5c 100644
--- a/src/main/java/com/flowpowered/network/protocol/simple/SimpleProtocol.java
+++ b/src/main/java/com/flowpowered/network/protocol/simple/SimpleProtocol.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,17 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.protocol.simple;
+package com.flowpowered.network.protocol.simple;
 
 import java.lang.reflect.InvocationTargetException;
 
-import com.flowpowered.networking.Codec;
-import com.flowpowered.networking.Codec.CodecRegistration;
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.MessageHandler;
-import com.flowpowered.networking.protocol.AbstractProtocol;
-import com.flowpowered.networking.service.CodecLookupService;
-import com.flowpowered.networking.service.HandlerLookupService;
+import com.flowpowered.network.Codec;
+import com.flowpowered.network.Codec.CodecRegistration;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.MessageHandler;
+import com.flowpowered.network.protocol.AbstractProtocol;
+import com.flowpowered.network.service.CodecLookupService;
+import com.flowpowered.network.service.HandlerLookupService;
 
 import org.slf4j.Logger;
 
diff --git a/src/main/java/com/flowpowered/network/service/CodecLookupService.java b/src/main/java/com/flowpowered/network/service/CodecLookupService.java
index a99f10b..949ec21 100644
--- a/src/main/java/com/flowpowered/network/service/CodecLookupService.java
+++ b/src/main/java/com/flowpowered/network/service/CodecLookupService.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.service;
+package com.flowpowered.network.service;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -29,10 +29,10 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.flowpowered.networking.Codec;
-import com.flowpowered.networking.Codec.CodecRegistration;
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.exception.IllegalOpcodeException;
+import com.flowpowered.network.Codec;
+import com.flowpowered.network.Codec.CodecRegistration;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.exception.IllegalOpcodeException;
 
 /**
  * A class used to lookup message codecs.
diff --git a/src/main/java/com/flowpowered/network/service/HandlerLookupService.java b/src/main/java/com/flowpowered/network/service/HandlerLookupService.java
index fcba04d..2e91ec9 100644
--- a/src/main/java/com/flowpowered/network/service/HandlerLookupService.java
+++ b/src/main/java/com/flowpowered/network/service/HandlerLookupService.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.service;
+package com.flowpowered.network.service;
 
-import com.flowpowered.networking.MessageHandler;
-import com.flowpowered.networking.Message;
+import com.flowpowered.network.MessageHandler;
+import com.flowpowered.network.Message;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/main/java/com/flowpowered/network/session/BasicSession.java b/src/main/java/com/flowpowered/network/session/BasicSession.java
index 51f2490..79e5ccb 100644
--- a/src/main/java/com/flowpowered/network/session/BasicSession.java
+++ b/src/main/java/com/flowpowered/network/session/BasicSession.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,17 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.session;
+package com.flowpowered.network.session;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Random;
 
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.MessageHandler;
-import com.flowpowered.networking.exception.ChannelClosedException;
-import com.flowpowered.networking.processor.MessageProcessor;
-import com.flowpowered.networking.protocol.AbstractProtocol;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.MessageHandler;
+import com.flowpowered.network.exception.ChannelClosedException;
+import com.flowpowered.network.processor.MessageProcessor;
+import com.flowpowered.network.protocol.AbstractProtocol;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelOption;
diff --git a/src/main/java/com/flowpowered/network/session/PulsingSession.java b/src/main/java/com/flowpowered/network/session/PulsingSession.java
index 78b54bb..9fde3fe 100644
--- a/src/main/java/com/flowpowered/network/session/PulsingSession.java
+++ b/src/main/java/com/flowpowered/network/session/PulsingSession.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,18 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.session;
+package com.flowpowered.network.session;
 
 import java.util.ArrayDeque;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import com.flowpowered.networking.AsyncableMessage;
+import com.flowpowered.network.AsyncableMessage;
 import io.netty.channel.Channel;
 
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.exception.ChannelClosedException;
-import com.flowpowered.networking.protocol.AbstractProtocol;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.exception.ChannelClosedException;
+import com.flowpowered.network.protocol.AbstractProtocol;
 
 /**
  * Represents a {@link BasicSession} which has both a {@link State} and {@link SendType}. It can queue messages if needed.
diff --git a/src/main/java/com/flowpowered/network/session/Session.java b/src/main/java/com/flowpowered/network/session/Session.java
index 2762fd8..ec826a6 100644
--- a/src/main/java/com/flowpowered/network/session/Session.java
+++ b/src/main/java/com/flowpowered/network/session/Session.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.session;
+package com.flowpowered.network.session;
 
 
-import com.flowpowered.networking.Message;
-import com.flowpowered.networking.exception.ChannelClosedException;
-import com.flowpowered.networking.processor.MessageProcessor;
-import com.flowpowered.networking.protocol.Protocol;
+import com.flowpowered.network.Message;
+import com.flowpowered.network.exception.ChannelClosedException;
+import com.flowpowered.network.processor.MessageProcessor;
+import com.flowpowered.network.protocol.Protocol;
 
 import org.slf4j.Logger;
 
diff --git a/src/main/java/com/flowpowered/network/util/AnnotatedMessageHandler.java b/src/main/java/com/flowpowered/network/util/AnnotatedMessageHandler.java
index 453c500..ffc04f3 100644
--- a/src/main/java/com/flowpowered/network/util/AnnotatedMessageHandler.java
+++ b/src/main/java/com/flowpowered/network/util/AnnotatedMessageHandler.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.util;
+package com.flowpowered.network.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -32,13 +32,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.flowpowered.networking.Message;
+import com.flowpowered.network.Message;
 
 /**
- * A class for handling messages with annotated methods referred to as handles. The methods need to be annotated with {@link com.flowpowered.networking.util.AnnotatedMessageHandler.Handle} and should only
- * have one parameter, the message, which needs to be a subclass of {@link com.flowpowered.networking.Message}. These should be instance methods inside any class. When creating the annotated message
+ * A class for handling messages with annotated methods referred to as handles. The methods need to be annotated with {@link com.flowpowered.network.util.AnnotatedMessageHandler.Handle} and should only
+ * have one parameter, the message, which needs to be a subclass of {@link com.flowpowered.network.Message}. These should be instance methods inside any class. When creating the annotated message
  * handler, an instance of the class containing the method is passed to the constructor. Handle methods will be called from this instance when handling messages. To handle a message, simply call
- * {@link #handle(com.flowpowered.networking.Message)} with the said message as a parameter. The thread calling {@link #handle(com.flowpowered.networking.Message)} is the same that calls the handle
+ * {@link #handle(com.flowpowered.network.Message)} with the said message as a parameter. The thread calling {@link #handle(com.flowpowered.network.Message)} is the same that calls the handle
  * method.
  */
 public class AnnotatedMessageHandler {
diff --git a/src/main/java/com/flowpowered/network/util/ByteBufUtils.java b/src/main/java/com/flowpowered/network/util/ByteBufUtils.java
index 90689d2..59b6015 100644
--- a/src/main/java/com/flowpowered/network/util/ByteBufUtils.java
+++ b/src/main/java/com/flowpowered/network/util/ByteBufUtils.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.util;
+package com.flowpowered.network.util;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/src/test/java/com/flowpowered/network/fake/ChannelHandlerContextFaker.java b/src/test/java/com/flowpowered/network/fake/ChannelHandlerContextFaker.java
index a457ecf..de56906 100644
--- a/src/test/java/com/flowpowered/network/fake/ChannelHandlerContextFaker.java
+++ b/src/test/java/com/flowpowered/network/fake/ChannelHandlerContextFaker.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.fake;
+package com.flowpowered.network.fake;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
diff --git a/src/test/java/com/flowpowered/network/fake/FakeChannelHandlerContext.java b/src/test/java/com/flowpowered/network/fake/FakeChannelHandlerContext.java
index 6b99f2b..a6cc2f8 100644
--- a/src/test/java/com/flowpowered/network/fake/FakeChannelHandlerContext.java
+++ b/src/test/java/com/flowpowered/network/fake/FakeChannelHandlerContext.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.fake;
+package com.flowpowered.network.fake;
 
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.Channel;
diff --git a/src/test/java/com/flowpowered/network/pipeline/MessageProcessorDecoderTest.java b/src/test/java/com/flowpowered/network/pipeline/MessageProcessorDecoderTest.java
index bdc1cf2..a54dac6 100644
--- a/src/test/java/com/flowpowered/network/pipeline/MessageProcessorDecoderTest.java
+++ b/src/test/java/com/flowpowered/network/pipeline/MessageProcessorDecoderTest.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.pipeline;
+package com.flowpowered.network.pipeline;
 
 import java.util.LinkedList;
 import java.util.Random;
@@ -33,10 +33,10 @@
 import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 
-import com.flowpowered.networking.fake.ChannelHandlerContextFaker;
-import com.flowpowered.networking.fake.FakeChannelHandlerContext;
-import com.flowpowered.networking.processor.MessageProcessor;
-import com.flowpowered.networking.processor.simple.SimpleMessageProcessor;
+import com.flowpowered.network.fake.ChannelHandlerContextFaker;
+import com.flowpowered.network.fake.FakeChannelHandlerContext;
+import com.flowpowered.network.processor.MessageProcessor;
+import com.flowpowered.network.processor.simple.SimpleMessageProcessor;
 
 public class MessageProcessorDecoderTest {
     private final int LENGTH = 65536;
diff --git a/src/test/java/com/flowpowered/network/util/ByteBufUtilsTest.java b/src/test/java/com/flowpowered/network/util/ByteBufUtilsTest.java
index 001173c..7065941 100644
--- a/src/test/java/com/flowpowered/network/util/ByteBufUtilsTest.java
+++ b/src/test/java/com/flowpowered/network/util/ByteBufUtilsTest.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of Flow Networking, licensed under the MIT License (MIT).
+ * This file is part of Flow Network, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2013 Spout LLC <https://spout.org/>
+ * Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.flowpowered.networking.util;
+package com.flowpowered.network.util;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;