diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
index 504d688665..919882d407 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
@@ -63,10 +63,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal
 
    private static final int NUM_PRIORITIES = 10;
 
-
-   // TODO: We need to set this to _hornetq | activemq based on the version of the protocol
-   // I have added a comment about this at https://issues.apache.org/jira/browse/ACTIVEMQ6-42
-   public static final SimpleString FORCED_DELIVERY_MESSAGE = new SimpleString("_activemq.forced.delivery.seq");
+   public static final SimpleString FORCED_DELIVERY_MESSAGE = new SimpleString("_hornetq.forced.delivery.seq");
 
    // Attributes
    // -----------------------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java
index 6628a9ef0b..b7366df301 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java
@@ -481,7 +481,7 @@ public class ActiveMQClientProtocolManager implements ClientProtocolManager
       if (transportConnection.isUsingProtocolHandling())
       {
          // no need to send handshake on inVM as inVM is not using the NettyProtocolHandling
-         String handshake = "ACTIVEMQ";
+         String handshake = "HORNETQ";
          ActiveMQBuffer amqbuffer = connection.createBuffer(handshake.length());
          amqbuffer.writeBytes(handshake.getBytes());
          transportConnection.write(amqbuffer);
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java
index 0558ae96de..5e14697b67 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java
@@ -166,17 +166,16 @@ class CoreProtocolManager implements ProtocolManager
    public void handshake(NettyServerConnection connection, ActiveMQBuffer buffer)
    {
       //if we are not an old client then handshake
-      if (buffer.getByte(0) == 'A' &&
-         buffer.getByte(1) == 'C' &&
-         buffer.getByte(2) == 'T' &&
-         buffer.getByte(3) == 'I' &&
-         buffer.getByte(4) == 'V' &&
-         buffer.getByte(5) == 'E' &&
-         buffer.getByte(6) == 'M' &&
-         buffer.getByte(7) == 'Q')
+      if (buffer.getByte(0) == 'H' &&
+         buffer.getByte(1) == 'O' &&
+         buffer.getByte(2) == 'R' &&
+         buffer.getByte(3) == 'N' &&
+         buffer.getByte(4) == 'E' &&
+         buffer.getByte(5) == 'T' &&
+         buffer.getByte(6) == 'Q')
       {
          //todo add some handshaking
-         buffer.readBytes(8);
+         buffer.readBytes(7);
       }
    }