diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
index db1ac120f3..9ecacdaed9 100644
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -19,10 +19,10 @@ set(SLIC3R_GUI_SOURCES
     GUI/AboutDialog.hpp
     GUI/ArrangeSettingsDialogImgui.hpp
     GUI/ArrangeSettingsDialogImgui.cpp
-    GUI/Auth.cpp
-    GUI/Auth.hpp
-    GUI/AuthSession.cpp
-    GUI/AuthSession.hpp
+    GUI/UserAccountCommunication.cpp
+    GUI/UserAccountCommunication.hpp
+    GUI/UserAccountSession.cpp
+    GUI/UserAccountSession.hpp
     GUI/UserAccount.cpp
     GUI/UserAccount.hpp
     GUI/WebViewDialog.cpp
diff --git a/src/slic3r/GUI/UserAccount.hpp b/src/slic3r/GUI/UserAccount.hpp
index 2a5365cd89..3154373375 100644
--- a/src/slic3r/GUI/UserAccount.hpp
+++ b/src/slic3r/GUI/UserAccount.hpp
@@ -1,7 +1,7 @@
 #ifndef slic3r_UserAccount_hpp_
 #define slic3r_UserAccount_hpp_
 
-#include "Auth.hpp"
+#include "UserAccountCommunication.hpp"
 #include "libslic3r/AppConfig.hpp"
 
 #include <string>
diff --git a/src/slic3r/GUI/Auth.cpp b/src/slic3r/GUI/UserAccountCommunication.cpp
similarity index 98%
rename from src/slic3r/GUI/Auth.cpp
rename to src/slic3r/GUI/UserAccountCommunication.cpp
index 23cb4b5ce2..0f44828361 100644
--- a/src/slic3r/GUI/Auth.cpp
+++ b/src/slic3r/GUI/UserAccountCommunication.cpp
@@ -1,4 +1,4 @@
-#include "Auth.hpp"
+#include "UserAccountCommunication.hpp"
 #include "GUI_App.hpp"
 #include "format.hpp"
 #include "../Utils/Http.hpp"
@@ -85,7 +85,7 @@ bool save_secret(const std::string& opt, const std::string& usr, const std::stri
         //show_error(nullptr, msg);
         return false;
     }
-    const wxString service = GUI::format_wxstr(L"%1%/PrusaAuth/%2%", SLIC3R_APP_NAME, opt);
+    const wxString service = GUI::format_wxstr(L"%1%/PrusaAccount/%2%", SLIC3R_APP_NAME, opt);
     const wxString username = boost::nowide::widen(usr);
     const wxSecretValue password(boost::nowide::widen(psswd));
     if (!store.Save(service, username, password)) {
@@ -111,7 +111,7 @@ bool load_secret(const std::string& opt, std::string& usr, std::string& psswd)
         //show_error(nullptr, msg);
         return false;
     }
-    const wxString service = GUI::format_wxstr(L"%1%/PrusaAuth/%2%", SLIC3R_APP_NAME, opt);
+    const wxString service = GUI::format_wxstr(L"%1%/PrusaAccount/%2%", SLIC3R_APP_NAME, opt);
     wxString username;
     wxSecretValue password;
     if (!store.Load(service, username, password)) {
diff --git a/src/slic3r/GUI/Auth.hpp b/src/slic3r/GUI/UserAccountCommunication.hpp
similarity index 95%
rename from src/slic3r/GUI/Auth.hpp
rename to src/slic3r/GUI/UserAccountCommunication.hpp
index bda8112cdb..553973c41c 100644
--- a/src/slic3r/GUI/Auth.hpp
+++ b/src/slic3r/GUI/UserAccountCommunication.hpp
@@ -1,7 +1,7 @@
-#ifndef slic3r_Auth_hpp_
-#define slic3r_Auth_hpp_
+#ifndef slic3r_UserAccountCommunication_hpp_
+#define slic3r_UserAccountCommunication_hpp_
 
-#include "AuthSession.hpp"
+#include "UserAccountSession.hpp"
 #include "Event.hpp"
 #include "libslic3r/AppConfig.hpp"
 
diff --git a/src/slic3r/GUI/AuthSession.cpp b/src/slic3r/GUI/UserAccountSession.cpp
similarity index 99%
rename from src/slic3r/GUI/AuthSession.cpp
rename to src/slic3r/GUI/UserAccountSession.cpp
index 925741b426..546d1656b6 100644
--- a/src/slic3r/GUI/AuthSession.cpp
+++ b/src/slic3r/GUI/UserAccountSession.cpp
@@ -1,4 +1,4 @@
-#include "AuthSession.hpp"
+#include "UserAccountSession.hpp"
 #include "GUI_App.hpp"
 #include "format.hpp"
 #include "../Utils/Http.hpp"
diff --git a/src/slic3r/GUI/AuthSession.hpp b/src/slic3r/GUI/UserAccountSession.hpp
similarity index 99%
rename from src/slic3r/GUI/AuthSession.hpp
rename to src/slic3r/GUI/UserAccountSession.hpp
index 246f196609..f6e7f5dcc1 100644
--- a/src/slic3r/GUI/AuthSession.hpp
+++ b/src/slic3r/GUI/UserAccountSession.hpp
@@ -1,5 +1,5 @@
-#ifndef slic3r_AuthSession_hpp_
-#define slic3r_AuthSession_hpp_
+#ifndef slic3r_UserAccountSession_hpp_
+#define slic3r_UserAccountSession_hpp_
 
 #include "Event.hpp"
 #include "libslic3r/AppConfig.hpp"