diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 406de35141..8d410d3182 100644
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -734,7 +734,7 @@ void CServerDlg::UpdateGUIDependencies()
 
     if ( pServer->IsDirectoryServer() )
     {
-        strStatus = tr ( "Now a directory server" );
+        strStatus = tr ( "Now a directory" );
     }
     else
     {
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 9bc0df89e7..d387995c00 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -385,7 +385,7 @@ void CServerListManager::SetIsDirectoryServer()
 
     if ( bIsDirectoryServer )
     {
-        qInfo() << "Now a directory server";
+        qInfo() << "Now a directory";
         // Load any persistent server list (create it if it is not there)
         (void) Load();
     }
diff --git a/src/util.h b/src/util.h
index 607815305c..6a828b5b83 100644
--- a/src/util.h
+++ b/src/util.h
@@ -645,7 +645,7 @@ inline QString svrRegStatusToString ( ESvrRegStatus eSvrRegStatus )
         return QCoreApplication::translate ( "CServerDlg", "Registered" );
 
     case SRS_SERVER_LIST_FULL:
-        return QCoreApplication::translate ( "CServerDlg", "Directory Server full" );
+        return QCoreApplication::translate ( "CServerDlg", "Directory server list full" );
 
     case SRS_VERSION_TOO_OLD:
         return QCoreApplication::translate ( "CServerDlg", "Your server version is too old" );