diff --git a/src/explorviz/hpc_monitoring/connector/TCPConnector.java b/src/explorviz/hpc_monitoring/connector/TCPConnector.java
index 5a58a081e5e87b58dbac33f39b221764ef8b9229..f28ea5c19a1bd399b63dea0f97a37e30ee9a74ee 100644
--- a/src/explorviz/hpc_monitoring/connector/TCPConnector.java
+++ b/src/explorviz/hpc_monitoring/connector/TCPConnector.java
@@ -6,9 +6,9 @@ import java.net.Socket;
 
 import com.lmax.disruptor.EventHandler;
 
-import explorviz.hpc_monitoring.disruptor.Byte32ArrayEvent;
+import explorviz.hpc_monitoring.disruptor.ByteArrayEvent;
 
-public class TCPConnector implements EventHandler<Byte32ArrayEvent> {
+public class TCPConnector implements EventHandler<ByteArrayEvent> {
 	private static final int MESSAGE_BUFFER_SIZE = 65536;
 
 	private String providerUrl;
@@ -76,7 +76,7 @@ public class TCPConnector implements EventHandler<Byte32ArrayEvent> {
 	}
 
 	@Override
-	public void onEvent(final Byte32ArrayEvent event, final long sequence,
+	public void onEvent(final ByteArrayEvent event, final long sequence,
 			final boolean endOfBatch) throws Exception {
 		sendMessage(event.getValue(), event.getLength());
 	}
diff --git a/src/explorviz/hpc_monitoring/reader/MessageDistributer.java b/src/explorviz/hpc_monitoring/reader/MessageDistributer.java
index 4257f65da51ec0b8a39c944dcd94c09514012480..249bef8fac048c3a705c05fc5226161a0ee85e81 100644
--- a/src/explorviz/hpc_monitoring/reader/MessageDistributer.java
+++ b/src/explorviz/hpc_monitoring/reader/MessageDistributer.java
@@ -10,7 +10,7 @@ import com.lmax.disruptor.RingBuffer;
 import com.lmax.disruptor.dsl.Disruptor;
 
 import explorviz.hpc_monitoring.byteaccess.UnsafeBits;
-import explorviz.hpc_monitoring.disruptor.Byte65536ArrayEvent;
+import explorviz.hpc_monitoring.disruptor.ByteArrayEvent;
 import explorviz.hpc_monitoring.disruptor.RecordEvent;
 import explorviz.hpc_monitoring.filter.counting.CountingThroughputFilter;
 import explorviz.hpc_monitoring.record.IRecord;
@@ -20,7 +20,7 @@ import explorviz.hpc_monitoring.record.events.normal.AfterOperationEvent;
 import explorviz.hpc_monitoring.record.events.normal.BeforeOperationEvent;
 import gnu.trove.map.hash.TIntObjectHashMap;
 
-public class MessageDistributer implements EventHandler<Byte65536ArrayEvent> {
+public class MessageDistributer implements EventHandler<ByteArrayEvent> {
 
 	private static final CountingThroughputFilter counter = new CountingThroughputFilter(
 			"Records per second");
@@ -45,7 +45,7 @@ public class MessageDistributer implements EventHandler<Byte65536ArrayEvent> {
 	}
 
 	@Override
-	public void onEvent(final Byte65536ArrayEvent event, final long sequence,
+	public void onEvent(final ByteArrayEvent event, final long sequence,
 			final boolean endOfBatch) throws Exception {
 		final byte[] received = event.getValue();
 		final int receivedLength = event.getLength();
diff --git a/src/explorviz/hpc_monitoring/reader/TCPReader.java b/src/explorviz/hpc_monitoring/reader/TCPReader.java
index da5693682ed18f06233ee25ea2b7a908dde4c134..7180ab05771eac7622d871bfc5983aed4745e803 100644
--- a/src/explorviz/hpc_monitoring/reader/TCPReader.java
+++ b/src/explorviz/hpc_monitoring/reader/TCPReader.java
@@ -12,7 +12,7 @@ import com.lmax.disruptor.EventHandler;
 import com.lmax.disruptor.RingBuffer;
 import com.lmax.disruptor.dsl.Disruptor;
 
-import explorviz.hpc_monitoring.disruptor.Byte65536ArrayEvent;
+import explorviz.hpc_monitoring.disruptor.ByteArrayEvent;
 import explorviz.hpc_monitoring.disruptor.RecordEvent;
 
 public final class TCPReader {
@@ -23,7 +23,7 @@ public final class TCPReader {
 	private ServerSocketChannel serversocket;
 	private boolean active = true;
 
-	private final RingBuffer<Byte65536ArrayEvent> ringBuffer;
+	private final RingBuffer<ByteArrayEvent> ringBuffer;
 
 	private final ByteBuffer buffer;
 
@@ -35,11 +35,11 @@ public final class TCPReader {
 		buffer = ByteBuffer.allocateDirect(MESSAGE_BUFFER_SIZE);
 
 		final ExecutorService exec = Executors.newCachedThreadPool();
-		final Disruptor<Byte65536ArrayEvent> disruptor = new Disruptor<Byte65536ArrayEvent>(
-				Byte65536ArrayEvent.EVENT_FACTORY, 32, exec);
+		final Disruptor<ByteArrayEvent> disruptor = new Disruptor<ByteArrayEvent>(
+				ByteArrayEvent.EVENT_FACTORY, 32, exec);
 
 		@SuppressWarnings("unchecked")
-		final EventHandler<Byte65536ArrayEvent>[] eventHandlers = new EventHandler[1];
+		final EventHandler<ByteArrayEvent>[] eventHandlers = new EventHandler[1];
 		eventHandlers[0] = new MessageDistributer(endReceiver);
 		disruptor.handleEventsWith(eventHandlers);
 		ringBuffer = disruptor.start();
@@ -81,7 +81,7 @@ public final class TCPReader {
 
 	private void putInRingBuffer(final byte[] messages, final int readBytes) {
 		final long hiseq = ringBuffer.next();
-		final Byte65536ArrayEvent valueEvent = ringBuffer.get(hiseq);
+		final ByteArrayEvent valueEvent = ringBuffer.get(hiseq);
 		valueEvent.setValue(messages);
 		valueEvent.setLength(readBytes);
 		ringBuffer.publish(hiseq);