diff --git a/common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala b/common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala
index 84105cea..f5300783 100644
--- a/common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala
+++ b/common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala
@@ -5,7 +5,13 @@ import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, Plan
 import scodec.Codec
 import scodec.codecs._
 
-final case class ConnectToWorldMessage(server : String, serverIp : String, port : Int)
+/**
+  * Is sent in response to the PlanetSide client in order to give server information on the world server.
+  * @param server The name of the server to connect to
+  * @param serverAddress The IP or hostname of the server to connect to
+  * @param port The 16-bit port number to connect on
+  */
+final case class ConnectToWorldMessage(server : String, serverAddress : String, port : Int)
   extends PlanetSideGamePacket {
   type Packet = ConnectToWorldMessage
   def opcode = GamePacketOpcode.ConnectToWorldMessage
@@ -15,7 +21,7 @@ final case class ConnectToWorldMessage(server : String, serverIp : String, port
 object ConnectToWorldMessage extends Marshallable[ConnectToWorldMessage] {
   implicit val codec : Codec[ConnectToWorldMessage] = (
       ("server_name" | PacketHelpers.encodedString) ::
-      ("server_ip" | PacketHelpers.encodedString) ::
+      ("server_address" | PacketHelpers.encodedString) ::
       ("server_port" | uint16L)
     ).as[ConnectToWorldMessage]
 }
\ No newline at end of file