diff --git a/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPacketDispatcher_Inline.jinja b/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPacketDispatcher_Inline.jinja
index 73c3227cd5..a621af92cb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPacketDispatcher_Inline.jinja
+++ b/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPacketDispatcher_Inline.jinja
@@ -6,25 +6,25 @@ namespace {{ xml.attrib['Name'] }}
     {
         switch (aznumeric_cast<int32_t>(packetHeader.GetPacketType()))
         {
-{% set hs = namespace(handshake=false) %}
+{% set packet_ns = namespace(handshake=false) %}
 {%      for Packet in xml.iter('Packet') %}
-{%      if ('HandshakePacket' in Packet.attrib) and (Packet.attrib['HandshakePacket'] == 'true') %}
-{% set hs.handshake = True %}
-{%      endif %}
+{%          if ('HandshakePacket' in Packet.attrib) and (Packet.attrib['HandshakePacket'] == 'true') %}
+{% set packet_ns.handshake = True %}
+{%          endif %}
 {%      endfor %}
 
 {%      for Packet in xml.iter('Packet') %}
             case aznumeric_cast<int32_t>({{ Packet.attrib['Name'] }}::Type):
             {
                 AZLOG(Debug_DispatchPackets, "Received packet %s", "{{ Packet.attrib['Name'] }}");
-{%      if hs.handshake %}
-{%      if ('HandshakePacket' not in Packet.attrib) or (Packet.attrib['HandshakePacket'] == 'false') %}
+{%      if packet_ns.handshake %}
+{%          if ('HandshakePacket' not in Packet.attrib) or (Packet.attrib['HandshakePacket'] == 'false') %}
                 if (!handler.IsHandshakeComplete(connection))
                 {
                     return AzNetworking::PacketDispatchResult::Skipped;
                 }
-{% endif %}
-{% endif %}
+{%          endif %}
+{%      endif %}
 
                 {{ Packet.attrib['Name'] }} packet;
                 if (!serializer.Serialize(packet, "Packet"))
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h b/Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h
index 01914f55ae..90dfcc16bd 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h
@@ -51,7 +51,6 @@ namespace Multiplayer
         //! @param canSendUpdates the state value
         virtual void SetCanSendUpdates(bool canSendUpdates) = 0;
 
-
         //! Fetches the state of connection whether handshake logic has completed
         //! @return true if handshake has completed
         virtual bool DidHandshake() const = 0;