diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index 16673af5..42f5d408 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -592,6 +592,7 @@ NEWSYM TrapMouseCursor, db 1
 NEWSYM KeyQuickClock, dd 0
 NEWSYM KeyQuickMinimize, dd 0
 NEWSYM AutoIncSaveSlot, db 0
+NEWSYM TCPIPAddress, db '',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 
 GUIsave equ $-GUIRAdd
 
diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc
index 591e8e36..475cb048 100644
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -644,7 +644,7 @@ GUITCPIPKeys:
 ;GUINetTextm2 db 0,0,0
     cmp byte[GUINetTextm2],1
     je near .section2
-    mov edi,GUINetTextk2
+    mov edi,TCPIPAddress
     mov esi,26
     cmp byte[GUINetTextm2],2
     jne .notsecondstring
diff --git a/zsnes/src/gui/guinetpl.inc b/zsnes/src/gui/guinetpl.inc
index 42959c30..59fa62c5 100644
--- a/zsnes/src/gui/guinetpl.inc
+++ b/zsnes/src/gui/guinetpl.inc
@@ -116,7 +116,7 @@ ProcessModem:
     call .writestr
     mov esi,.tcpipip2
     call .writestr
-    mov esi,GUINetTextk2
+    mov esi,TCPIPAddress
     call .writestr
     mov esi,.tcpipret
     call .writestr
@@ -972,11 +972,11 @@ ProcessRemoteCommand:
     call RemoteDeInit
     ret
 .loadfail
-    cmp dword[GUINetTextk2],'127.'
+    cmp dword[TCPIPAddress],'127.'
     jne .nonum
-    cmp dword[GUINetTextk2+4],'0.0.'
+    cmp dword[TCPIPAddress+4],'0.0.'
     jne .nonum
-    cmp byte[GUINetTextk2+8],'1'
+    cmp byte[TCPIPAddress+8],'1'
     je near .startloadingb
 .nonum
     mov esi,.filenotu
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 5d350a18..d055cf29 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -3848,7 +3848,7 @@ DisplayNetOptnsTCPIP:
     mov byte[GUItextcolor],222
 .zero2
     GUIOuttextwin2 8,59,15,GUINetTextl2
-    GUIOuttextwin2 8,30,60,GUINetTextk2
+    GUIOuttextwin2 8,30,60,TCPIPAddress
     GUIOuttextwin2 8,59,25,ChatNick
     mov byte[GUINetTextn2],'_'
     test byte[GUINetTextm2+2],8
@@ -4389,7 +4389,6 @@ GUINetTextg2 db 'START AS SERVER',0
 GUINetTexth2 db 'CLIENT OPTIONS:',0
 GUINetTexti2 db 'IP:',0
 GUINetTextj2 db 'CONNECT TO SERVER',0
-NEWSYM GUINetTextk2, db '',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 GUINetTextl2 db '7845',0,0,0
 GUINetTextm2 db 0,0,0
 GUINetTextn2 db '_',0
diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm
index 2e7715b3..f8cd4e6c 100644
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -107,7 +107,7 @@ EXTSYM InitTCP
 EXTSYM StartServerCycle
 EXTSYM ServerCheckNewClient
 EXTSYM acceptzuser
-EXTSYM GUINetTextk2
+EXTSYM TCPIPAddress
 EXTSYM ConnectServer
 EXTSYM WaitForServer
 EXTSYM SendData
@@ -1500,8 +1500,8 @@ NEWSYM TCPIPInitConnectToServer
     or eax,eax
     jnz .failed
     mov byte[TCPIPStatus],1
-    ; Convert GUINetTextk2 to IPAddrStr
-    mov ebx,GUINetTextk2
+    ; Convert TCPIPAddress to IPAddrStr
+    mov ebx,TCPIPAddress
     mov edx,IPAddrStr
 .notend
     mov al,[ebx]
diff --git a/zsnes/src/linux/zloaderw.c b/zsnes/src/linux/zloaderw.c
index b3fe19a7..d19d39b2 100644
--- a/zsnes/src/linux/zloaderw.c
+++ b/zsnes/src/linux/zloaderw.c
@@ -45,7 +45,7 @@ extern unsigned char	Palette0, SPC700sh, OffBy1Line, DSPDisable,
 			romtype, scanlines, showallext, smallscreenon, soundon,
 			spcon, vsyncon, DisplayS, fname, filefound, SnowOn,
 			NetChatFirst,NetServer,NetNewNick,
-			NetFilename,GUINetTextk2,NetQuitAfter,UDPConfig;
+			NetFilename,TCPIPAddress,NetQuitAfter,UDPConfig;
 
 int getopt(int argc, char *const argv[], const char *optstring);
 extern char *optarg;
diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm
index 286d137e..d625b49c 100644
--- a/zsnes/src/win/winintrf.asm
+++ b/zsnes/src/win/winintrf.asm
@@ -120,7 +120,7 @@ EXTSYM InitTCP
 EXTSYM StartServerCycle
 EXTSYM ServerCheckNewClient
 EXTSYM acceptzuser
-EXTSYM GUINetTextk2
+EXTSYM TCPIPAddress
 EXTSYM ConnectServer
 EXTSYM WaitForServer
 EXTSYM SendData
@@ -1789,8 +1789,8 @@ NEWSYM TCPIPInitConnectToServer
     or eax,eax
     jnz .failed
     mov byte[TCPIPStatus],1
-    ; Convert GUINetTextk2 to IPAddrStr
-    mov ebx,GUINetTextk2
+    ; Convert TCPIPAddress to IPAddrStr
+    mov ebx,TCPIPAddress
     mov edx,IPAddrStr
 .notend
     mov al,[ebx]
diff --git a/zsnes/src/win/zloaderw.c b/zsnes/src/win/zloaderw.c
index c1c99d70..0a0b5744 100644
--- a/zsnes/src/win/zloaderw.c
+++ b/zsnes/src/win/zloaderw.c
@@ -40,7 +40,7 @@ extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable,
                      romtype, scanlines, showallext, smallscreenon, soundon,
                      spcon, vsyncon, DisplayS, fname, filefound, SnowOn,
                      NetChatFirst,NetServer,NetNewNick,
-                     NetFilename,GUINetTextk2,NetQuitAfter,UDPConfig;
+                     NetFilename,TCPIPAddress,NetQuitAfter,UDPConfig;
 
 void ccmdline(void);
 
@@ -170,7 +170,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdSh
          if (strptr<4) {
            NetServer=0;
          } else {
-           strp=&GUINetTextk2;
+           strp=&TCPIPAddress;
            strncpy(strp,ExtA[3],28);
          }
        }