diff --git a/src/buffer.cpp b/src/buffer.cpp
index 58ee7f72..acb63861 100755
--- a/src/buffer.cpp
+++ b/src/buffer.cpp
@@ -250,14 +250,14 @@ void CNetBufWithStats::UpdateAutoSetting()
     }
 
     // apply non-linear IIR filter
-    LlconMath().UpDownIIR1 ( dCurIIRFilterResult,
+    MathUtils().UpDownIIR1 ( dCurIIRFilterResult,
                              static_cast<double> ( iCurDecision ),
                              dWeightUp,
                              dWeightDown );
 
     // apply a hysteresis
     iCurAutoBufferSizeSetting =
-        LlconMath().DecideWithHysteresis ( dCurIIRFilterResult,
+        MathUtils().DecideWithHysteresis ( dCurIIRFilterResult,
                                            iCurDecidedResult,
                                            dHysteresisValue );
 
diff --git a/src/client.cpp b/src/client.cpp
index f8124b50..6c874b11 100755
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -319,8 +319,8 @@ void CClient::SetDoAutoSockBufSize ( const bool bValue )
 bool CClient::SetServerAddr ( QString strNAddr )
 {
     CHostAddress HostAddress;
-    if ( LlconNetwUtil().ParseNetworkAddress ( strNAddr,
-                                               HostAddress ) )
+    if ( NetworkUtil().ParseNetworkAddress ( strNAddr,
+                                             HostAddress ) )
     {
         // apply address to the channel
         Channel.SetAddress ( HostAddress );
@@ -1231,5 +1231,5 @@ int CClient::EstimatedOverallDelay ( const int iPingTimeMs )
         dTotalSoundCardDelayMs +
         dAdditionalAudioCodecDelayMs;
 
-    return LlconMath::round ( dTotalBufferDelayMs + iPingTimeMs );
+    return MathUtils::round ( dTotalBufferDelayMs + iPingTimeMs );
 }
diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
index 9695278c..242827de 100755
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@@ -159,8 +159,8 @@ void CConnectDlg::showEvent ( QShowEvent* )
     // get the IP address of the central server (using the ParseNetworAddress
     // function) when the connect dialog is opened, this seems to be the correct
     // time to do it
-    if ( LlconNetwUtil().ParseNetworkAddress ( strCentralServerAddress,
-                                               CentralServerAddress ) )
+    if ( NetworkUtil().ParseNetworkAddress ( strCentralServerAddress,
+                                             CentralServerAddress ) )
     {
         // send the request for the server list
         emit ReqServerListQuery ( CentralServerAddress );
@@ -371,7 +371,7 @@ void CConnectDlg::OnTimerPing()
 
         // try to parse host address string which is stored as user data
         // in the server list item GUI control element
-        if ( LlconNetwUtil().ParseNetworkAddress (
+        if ( NetworkUtil().ParseNetworkAddress (
                 lvwServers->topLevelItem ( iIdx )->
                 data ( 0, Qt::UserRole ).toString(),
                 CurServerAddress ) )
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 0dde28a0..50671c89 100755
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -118,7 +118,7 @@ CServerListManager::CServerListManager ( const quint16  iNPortNum,
                                               true );
 
         // [server n address]
-        LlconNetwUtil().ParseNetworkAddress (
+        NetworkUtil().ParseNetworkAddress (
             slServInfoSeparateParams[iCurUsedServInfoSplitItems],
             NewServerListEntry.HostAddr );
 
@@ -469,8 +469,8 @@ void CServerListManager::SlaveServerRegisterServer ( const bool bIsRegister )
     // Note that we always have to parse the server address again since if
     // it is an URL of a dynamic IP address, the IP address might have
     // changed in the meanwhile.
-    if ( LlconNetwUtil().ParseNetworkAddress ( strCurCentrServAddr,
-                                               SlaveCurCentServerHostAddress ) )
+    if ( NetworkUtil().ParseNetworkAddress ( strCurCentrServAddr,
+                                             SlaveCurCentServerHostAddress ) )
     {
         if ( bIsRegister )
         {
diff --git a/src/util.cpp b/src/util.cpp
index a621ce8d..91f8c314 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -421,8 +421,8 @@ CLlconHelpMenu::CLlconHelpMenu ( QWidget* parent ) : QMenu ( "&?", parent )
 * Other Classes                                                                *
 \******************************************************************************/
 // Network utility functions ---------------------------------------------------
-bool LlconNetwUtil::ParseNetworkAddress ( QString       strAddress,
-                                          CHostAddress& HostAddress )
+bool NetworkUtil::ParseNetworkAddress ( QString       strAddress,
+                                        CHostAddress& HostAddress )
 {
     QHostAddress InetAddr;
     quint16      iNetPort = LLCON_DEFAULT_PORT_NUMBER;
diff --git a/src/util.h b/src/util.h
index 0325b7d4..a885ba7f 100755
--- a/src/util.h
+++ b/src/util.h
@@ -851,7 +851,7 @@ public:
 
 
 // Network utility functions ---------------------------------------------------
-class LlconNetwUtil
+class NetworkUtil
 {
 public:
     static bool ParseNetworkAddress ( QString       strAddress,
@@ -900,7 +900,7 @@ protected:
 
 
 // Mathematics utilities -------------------------------------------------------
-class LlconMath
+class MathUtils
 {
 public:
     static int round ( double x )