diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 773918a9e..5f88e2ddc 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -440,7 +440,7 @@ void MainWindow::on_m_pLabelComputerName_linkActivated(const QString &) {
 
 void MainWindow::on_m_pLabelFingerprint_linkActivated(const QString &) {
   QMessageBox::information(
-      this, "SSL/TLS fingerprint", TlsFingerprint::local().readFirst());
+      this, "TLS fingerprint", TlsFingerprint::local().readFirst());
 }
 
 void MainWindow::on_m_pRadioGroupServer_clicked(bool) {
diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp
index d51b914b9..2986d93bd 100644
--- a/src/lib/arch/unix/ArchFileUnix.cpp
+++ b/src/lib/arch/unix/ArchFileUnix.cpp
@@ -105,7 +105,7 @@ std::string ArchFileUnix::getProfileDirectory() {
     dir = m_profileDirectory;
   } else {
 #if WINAPI_XWINDOWS
-    dir = getUserDirectory().append("/." DESKFLOW_APP_ID);
+    dir = getUserDirectory().append("/.config/" DESKFLOW_APP_NAME);
 #else
     dir = getUserDirectory().append("/Library/" DESKFLOW_APP_NAME);
 #endif
diff --git a/src/lib/gui/paths.h b/src/lib/gui/paths.h
index b36ec2051..cfcb79aa6 100644
--- a/src/lib/gui/paths.h
+++ b/src/lib/gui/paths.h
@@ -23,8 +23,9 @@
 #include <QStandardPaths>
 #include <QString>
 
-const auto kCertificateFilename = QString("%1.pem").arg(DESKFLOW_APP_NAME);
-const auto kSslDir = "SSL";
+// TODO: Reduce duplication of these strings between here and SecureSocket.cpp
+const auto kCertificateFilename = QString("%1.pem").arg(DESKFLOW_APP_ID);
+const auto kSslDir = "tls";
 
 namespace deskflow::gui::paths {
 
diff --git a/src/lib/gui/tls/TlsFingerprint.cpp b/src/lib/gui/tls/TlsFingerprint.cpp
index f306efab6..0592a2266 100644
--- a/src/lib/gui/tls/TlsFingerprint.cpp
+++ b/src/lib/gui/tls/TlsFingerprint.cpp
@@ -22,10 +22,11 @@
 #include <QDir>
 #include <QTextStream>
 
-static const char kDirName[] = "SSL/Fingerprints";
-static const char kLocalFilename[] = "Local.txt";
-static const char kTrustedServersFilename[] = "TrustedServers.txt";
-static const char kTrustedClientsFilename[] = "TrustedClients.txt";
+// TODO: Reduce duplication of these strings between here and SecureSocket.cpp
+static const char kDirName[] = "tls";
+static const char kLocalFilename[] = "local-fingerprint";
+static const char kTrustedServersFilename[] = "trusted-servers";
+static const char kTrustedClientsFilename[] = "trusted-clients";
 
 TlsFingerprint::TlsFingerprint(const QString &filename)
     : m_Filename(filename) {}
diff --git a/src/lib/net/InverseSockets/SecureServerSocket.cpp b/src/lib/net/InverseSockets/SecureServerSocket.cpp
index 89b2c5658..f152f4687 100644
--- a/src/lib/net/InverseSockets/SecureServerSocket.cpp
+++ b/src/lib/net/InverseSockets/SecureServerSocket.cpp
@@ -69,10 +69,10 @@ std::string SecureServerSocket::getCertificateFileName() const {
   auto certificateFilename = ArgParser::argsBase().m_tlsCertFile;
 
   if (certificateFilename.empty()) {
-    // default location of the TLS cert file in users dir
+    // TODO: Reduce duplication of these strings between here and
+    // SecureSocket.cpp
     certificateFilename = deskflow::string::sprintf(
-        "%s/SSL/" DESKFLOW_APP_NAME ".pem",
-        ARCH->getProfileDirectory().c_str());
+        "%s/tls/" DESKFLOW_APP_ID ".pem", ARCH->getProfileDirectory().c_str());
   }
 
   return certificateFilename;
diff --git a/src/lib/net/InverseSockets/SslApi.cpp b/src/lib/net/InverseSockets/SslApi.cpp
index 1d2a56efb..b593c7eb0 100644
--- a/src/lib/net/InverseSockets/SslApi.cpp
+++ b/src/lib/net/InverseSockets/SslApi.cpp
@@ -159,9 +159,9 @@ std::string SslApi::getFingerprint() const {
 }
 
 bool SslApi::isTrustedFingerprint(const std::string &fingerprint) const {
+  // TODO: Reduce duplication of these strings between here and SecureSocket.cpp
   auto trustedServersFilename = deskflow::string::sprintf(
-      "%s/SSL/Fingerprints/TrustedServers.txt",
-      ARCH->getProfileDirectory().c_str());
+      "%s/tls/trusted-servers", ARCH->getProfileDirectory().c_str());
 
   // check if this fingerprint exist
   std::ifstream file;
diff --git a/src/lib/net/SecureListenSocket.cpp b/src/lib/net/SecureListenSocket.cpp
index 1fc3d0b49..fabc22b08 100644
--- a/src/lib/net/SecureListenSocket.cpp
+++ b/src/lib/net/SecureListenSocket.cpp
@@ -25,8 +25,9 @@
 #include "net/SocketMultiplexer.h"
 #include "net/TSocketMultiplexerMethodJob.h"
 
-static const char s_certificateDir[] = {"SSL"};
-static const char s_certificateFilename[] = {DESKFLOW_APP_NAME ".pem"};
+// TODO: Reduce duplication of these strings between here and SecureSocket.cpp
+static const char s_certificateDir[] = {"tls"};
+static const char s_certificateFilename[] = {DESKFLOW_APP_ID ".pem"};
 
 //
 // SecureListenSocket
diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index 739841f14..fd40718ed 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -45,11 +45,9 @@ static const float s_retryDelay = 0.01f;
 
 enum { kMsgSize = 128 };
 
-static const char kFingerprintDirName[] = "SSL/Fingerprints";
-// static const char kFingerprintLocalFilename[] = "Local.txt";
-static const char kFingerprintTrustedServersFilename[] = "TrustedServers.txt";
-// static const char kFingerprintTrustedClientsFilename[] =
-// "TrustedClients.txt";
+// TODO: Reduce duplication of these strings between here and TlsFingerprint.cpp
+static const char kFingerprintDirName[] = "tls";
+static const char kFingerprintTrustedServersFilename[] = "trusted-servers";
 
 struct Ssl {
   SSL_CTX *m_context;