diff --git a/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java b/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java
index 8ac127e97f..5f83980515 100644
--- a/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java
+++ b/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java
@@ -101,7 +101,7 @@ public class NetworkPublication
     private final Position senderLimit;
     private final SendChannelEndpoint channelEndpoint;
     private final ByteBuffer heartbeatBuffer;
-    private final DataHeaderFlyweight dataHeader;
+    private final DataHeaderFlyweight heartbeatDataHeader;
     private final ByteBuffer setupBuffer;
     private final SetupFlyweight setupHeader;
     private final ByteBuffer rttMeasurementBuffer;
@@ -149,7 +149,7 @@ public NetworkPublication(
         setupBuffer = threadLocals.setupBuffer();
         setupHeader = threadLocals.setupHeader();
         heartbeatBuffer = threadLocals.heartbeatBuffer();
-        dataHeader = threadLocals.heartbeatDataHeader();
+        heartbeatDataHeader = threadLocals.heartbeatDataHeader();
         rttMeasurementBuffer = threadLocals.rttMeasurementBuffer();
         rttMeasurementHeader = threadLocals.rttMeasurementHeader();
 
@@ -472,7 +472,7 @@ private int heartbeatMessageCheck(final long now, final int activeTermId, final
         if (now > (timeOfLastSendOrHeartbeat + PUBLICATION_HEARTBEAT_TIMEOUT_NS))
         {
             heartbeatBuffer.clear();
-            dataHeader
+            heartbeatDataHeader
                 .sessionId(sessionId)
                 .streamId(streamId)
                 .termId(activeTermId)