diff --git a/SelectableCore.cpp b/SelectableCore.cpp
index 820e842..396f1ac 100644
--- a/SelectableCore.cpp
+++ b/SelectableCore.cpp
@@ -224,8 +224,8 @@ bool CSelectableCore::DestroyHandle( THandle * Handle )
         free( Handle->Name );
     if (Handle->Path)
         free( Handle->Path );
-    if (Handle->Address)
-        free( Handle->Address );
+    if (Handle->IPaddress)
+        free( Handle->IPaddress );
 
     // Destroy Buffers
     if (Handle->InBuffer)
@@ -305,14 +305,14 @@ bool  CSelectableCore::SetSocketHandle( THandle * Handle, EConnectType Type, con
     Handle->KeepAlive = KeepAlive;
 
     // Clear Address
-    if (Handle->Address) {
-        free( Handle->Address );
+    if (Handle->IPaddress) {
+        free( Handle->IPaddress );
     }
 
     // Set Address & Port
-    Handle->Address = (char*)malloc( strlen(Address)+1 );
-    strcpy( Handle->Address, Address );
-    Handle->PortNo = PortNo;
+    Handle->IPaddress = (char*)malloc( strlen(Address)+1 );
+    strcpy( Handle->IPaddress, Address );
+    Handle->PortName = PortNo;
 
     // Log event
     if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Set as %s [%s:%d]", Name, Handle->Name, ConnectTypeName[Type], Address, PortNo );
@@ -332,11 +332,11 @@ bool  CSelectableCore::ClearHandle( THandle * Handle )
         free( Handle->Path );
         Handle->Path = NULL;
     }
-    if (Handle->Address) {
-        free( Handle->Address );
-        Handle->Address = NULL;
+    if (Handle->IPaddress) {
+        free( Handle->IPaddress );
+        Handle->IPaddress = NULL;
     }
-    Handle->PortNo = 0;
+    Handle->PortName = 0;
 
     // Reset Parameters
     Handle->Type = ctNone;
@@ -575,15 +575,15 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
 
     // Create address
     address.sin_family       = AF_INET;
-    address.sin_addr.s_addr  = inet_addr(Handle->Address);
-    address.sin_port         = htons(Handle->PortNo);
+    address.sin_addr.s_addr  = inet_addr(Handle->IPaddress);
+    address.sin_port         = htons(Handle->PortName);
     addr_len                 = sizeof(address);
 
     // Create socket
     if ((Handle->FD = socket(AF_INET, SOCK_STREAM, 0)) < 0)
     {
         // Log Event
-        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Failed to create TCP Server socket [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Failed to create TCP Server socket [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
         // Set state
         ChangeState( Handle, csFailed );
@@ -595,7 +595,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
         (setsockopt( Handle->FD, SOL_SOCKET, SO_REUSEADDR, &Reuse_opt,        sizeof(Reuse_opt))        == -1))
     {
         // Log Event
-        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Could not set socket options [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Could not set socket options [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
         // Set state
         ChangeState( Handle, csFailed );
@@ -610,7 +610,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
          (setsockopt( Handle->FD, SOL_TCP,    TCP_KEEPINTVL, &TCPint_opt,    sizeof(TCPint_opt))    == -1)   ))
     {
         // Log Event
-        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Could not set KeepAlive options [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Could not set KeepAlive options [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
         // Set state
         ChangeState( Handle, csFailed );
@@ -625,7 +625,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
     if (bind( Handle->FD, (struct sockaddr *)&address, addr_len ) < 0)
     {
         // Log Event
-        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Failed to bind TCP Server socket [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Failed to bind TCP Server socket [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
         // Set state
         close( Handle->FD );
@@ -638,7 +638,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
     if (listen( Handle->FD, 5 ) < 0)
     {
         // Log Event
-        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Failed to listen on TCP Server socket [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Failed to listen on TCP Server socket [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
         // Set state
         close( Handle->FD );
@@ -648,7 +648,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
     };
 
     // Log Event
-    if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Server binded and listening [%s:%d]", Name, Handle->Name, Handle->Address, Handle->PortNo );
+    if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Server binded and listening [%s:%d]", Name, Handle->Name, Handle->IPaddress, Handle->PortName );
 
     // Add to Select Lists
     if (Selector) {
@@ -742,7 +742,7 @@ int CSelectableCore::OpenRemoteClientSocket( THandle * Handle )
         else if (Handle->State == csWaitingtoOpen)
         {
             // Log Event
-            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Remote TCP Client connection open [%s]", Name, Handle->Name, Handle->Address );
+            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Remote TCP Client connection open [%s]", Name, Handle->Name, Handle->IPaddress );
 
             // Update state
             ChangeState( Handle, csOpen );
@@ -776,7 +776,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
         if ((Handle->FD = socket( AF_INET, SOCK_STREAM, 0 )) < 0)
         {
             // Log Event
-            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Failed to create TCP Client socket [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Failed to create TCP Client socket [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
             // Set Status
             ChangeState( Handle, csFailed );
@@ -795,7 +795,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
              (setsockopt( Handle->FD, SOL_TCP,    TCP_KEEPINTVL, &TCPint_opt,    sizeof(TCPint_opt))    == -1)   ))
         {
             // Log Event
-            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Could not set KeepAlive options [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Could not set KeepAlive options [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
             // Set State
             close( Handle->FD );
@@ -807,13 +807,13 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
 
     // Declare address
     address.sin_family          = AF_INET;
-    address.sin_addr.s_addr     = inet_addr( Handle->Address );
-    address.sin_port            = htons( Handle->PortNo );
+    address.sin_addr.s_addr     = inet_addr( Handle->IPaddress );
+    address.sin_port            = htons( Handle->PortName );
     addr_len                    = sizeof(address);
 
     if (!connect( Handle->FD, (struct sockaddr *)&address, addr_len ))
     {
-        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Client connected [%s:%d]", Name, Handle->Name, Handle->Address, Handle->PortNo );
+        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Client connected [%s:%d]", Name, Handle->Name, Handle->IPaddress, Handle->PortName );
 
         // Add to Select Lists
         if (Selector) {
@@ -827,7 +827,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
     else if ((errno == EAGAIN) || (errno == EWOULDBLOCK) || (errno == EINPROGRESS) || (errno == EALREADY))
     {
         // Log Event
-        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Client waiting to connect [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Client waiting to connect [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
         // Add to Select Lists
         if (Selector) {
@@ -841,7 +841,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
     else
     {
         // Log Event
-        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Client could not connect [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
+        if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Client could not connect [%s:%d] (%s)", Name, Handle->Name, Handle->IPaddress, Handle->PortName, strerror(errno) );
 
         // Remove from Select List
         if (Selector) {
@@ -946,15 +946,15 @@ bool CSelectableCore::Close( THandle * Handle, bool CloseChildren )
             break;
 
         case ctServer:
-            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Server %s [%s:%d]", Name, Handle->Name, ((Fail)? "failed" : "closed"), Handle->Address, Handle->PortNo );
+            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Server %s [%s:%d]", Name, Handle->Name, ((Fail)? "failed" : "closed"), Handle->IPaddress, Handle->PortName );
             break;
 
         case ctRemoteClient:
-            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Remote TCP Client connection %s [%s]", Name, Handle->Name, ((Fail)? "failed" : "closed"), Handle->Address );
+            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - Remote TCP Client connection %s [%s]", Name, Handle->Name, ((Fail)? "failed" : "closed"), Handle->IPaddress );
             break;
 
         case ctClient:
-            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Client connection %s [%s:%d]", Name, Handle->Name, ((Fail)? "failed" : "closed"), Handle->Address, Handle->PortNo );
+            if (Log)  Log->Message( LogLevel, dlMedium, "%s: Handle '%s' - TCP Client connection %s [%s:%d]", Name, Handle->Name, ((Fail)? "failed" : "closed"), Handle->IPaddress, Handle->PortName );
             break;
 
         case ctNone:
diff --git a/SelectableCore.h b/SelectableCore.h
index 8126024..d412e86 100644
--- a/SelectableCore.h
+++ b/SelectableCore.h
@@ -87,8 +87,8 @@ struct SHandle {
 
     pid_t       ChildPID;  // Forked child PID
 
-    char        * Address; // Socket IP address
-    int         PortNo;    // Socket port no
+    char        * IPaddress; // Socket IP address
+    int         PortName;    // Socket port no
     bool        KeepAlive; // Socket keep alive
 
     // Buffers