diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp
index 959bb65..7772ce4 100644
--- a/DMRNetwork.cpp
+++ b/DMRNetwork.cpp
@@ -128,7 +128,7 @@ bool CDMRNetwork::open()
 {
 	LogMessage("DMR, Opening DMR Network");
 
-	if (CUDPSocket::isnone(m_address))
+	if (CUDPSocket::isNone(m_address))
 		CUDPSocket::lookup(m_addressStr, m_port, m_address, m_addrlen);
 
 	m_status = WAITING_CONNECT;
diff --git a/DStarNetwork.cpp b/DStarNetwork.cpp
index 551a1c5..b499853 100644
--- a/DStarNetwork.cpp
+++ b/DStarNetwork.cpp
@@ -65,7 +65,7 @@ bool CDStarNetwork::open()
 {
 	LogMessage("Opening D-Star network connection");
 
-	if (CUDPSocket::isnone(m_address))
+	if (CUDPSocket::isNone(m_address))
 		return false;
 
 	m_pollTimer.start();
diff --git a/NXDNIcomNetwork.cpp b/NXDNIcomNetwork.cpp
index 3b340cc..c118be6 100644
--- a/NXDNIcomNetwork.cpp
+++ b/NXDNIcomNetwork.cpp
@@ -50,7 +50,7 @@ bool CNXDNIcomNetwork::open()
 {
 	LogMessage("Opening NXDN network connection");
 
-	if (CUDPSocket::isnone(m_address))
+	if (CUDPSocket::isNone(m_address))
 		return false;
 
 	return m_socket.open();
diff --git a/NXDNKenwoodNetwork.cpp b/NXDNKenwoodNetwork.cpp
index f84af6e..22165dd 100644
--- a/NXDNKenwoodNetwork.cpp
+++ b/NXDNKenwoodNetwork.cpp
@@ -82,8 +82,8 @@ bool CNXDNKenwoodNetwork::open()
 {
 	LogMessage("Opening Kenwood connection");
 
-	if (CUDPSocket::isnone(m_rtpaddress) ||
-	    CUDPSocket::isnone(m_rtcpaddress))
+	if (CUDPSocket::isNone(m_rtpaddress) ||
+	    CUDPSocket::isNone(m_rtcpaddress))
 		return false;
 
 	if (!m_rtcpSocket.open())
@@ -766,7 +766,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data)
 	sockaddr_storage address;
 	unsigned int addrlen;
 	int length = m_rtpSocket.read(buffer, BUFFER_LENGTH, address, addrlen);
-	if (length <= 0 || !CUDPSocket::match_addr(m_rtpaddress, address))
+	if (length <= 0 || !CUDPSocket::match(m_rtpaddress, address, IMT_ADDRESS_ONLY))
 		return 0U;
 
 	if (!m_enabled)
@@ -789,7 +789,7 @@ unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data)
 	sockaddr_storage address;
 	unsigned int addrlen;
 	int length = m_rtcpSocket.read(buffer, BUFFER_LENGTH, address, addrlen);
-	if (length <= 0 || !CUDPSocket::match_addr(m_rtcpaddress, address))
+	if (length <= 0 || !CUDPSocket::match(m_rtcpaddress, address, IMT_ADDRESS_ONLY))
 		return 0U;
 
 	if (!m_enabled)
diff --git a/P25Network.cpp b/P25Network.cpp
index ed28fa6..8485d2f 100644
--- a/P25Network.cpp
+++ b/P25Network.cpp
@@ -107,7 +107,7 @@ bool CP25Network::open()
 {
 	LogMessage("Opening P25 network connection");
 
-	if (CUDPSocket::isnone(m_address))
+	if (CUDPSocket::isNone(m_address))
 		return false;
 
 	return m_socket.open(m_address.ss_family);
diff --git a/POCSAGNetwork.cpp b/POCSAGNetwork.cpp
index e6b755a..e8e0d65 100644
--- a/POCSAGNetwork.cpp
+++ b/POCSAGNetwork.cpp
@@ -47,7 +47,7 @@ bool CPOCSAGNetwork::open()
 {
 	LogMessage("Opening POCSAG network connection");
 
-	if (CUDPSocket::isnone(m_address))
+	if (CUDPSocket::isNone(m_address))
 		return false;
 
 	return m_socket.open();
diff --git a/YSFNetwork.cpp b/YSFNetwork.cpp
index ff5cab8..7ddc996 100644
--- a/YSFNetwork.cpp
+++ b/YSFNetwork.cpp
@@ -57,7 +57,7 @@ bool CYSFNetwork::open()
 {
 	LogMessage("Opening YSF network connection");
 
-	if (CUDPSocket::isnone(m_address))
+	if (CUDPSocket::isNone(m_address))
 		return false;
 
 	m_pollTimer.start();