diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
index 6a7e37057..1ae94ac87 100644
--- a/src/gui/Application.cpp
+++ b/src/gui/Application.cpp
@@ -95,7 +95,7 @@ Application::Application(int& argc, char** argv)
     if (userName.isEmpty()) {
         userName = qgetenv("USERNAME");
     }
-    QString identifier = "keepassx2";
+    QString identifier = "keepassxc";
     if (!userName.isEmpty()) {
         identifier.append("-");
         identifier.append(userName);
diff --git a/src/main.cpp b/src/main.cpp
index a4416e0a9..baa3df425 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char** argv)
     // QStandardPaths::writableLocation(QDesktopServices::DataLocation)
 
     if (app.isAlreadyRunning()) {
-        qWarning() << QCoreApplication::translate("Main", "Another instance of KeePassX 2 is already running.").toUtf8().constData();
+        qWarning() << QCoreApplication::translate("Main", "Another instance of KeePassXC is already running.").toUtf8().constData();
         return 0;
     }