diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt
index 5245b3977..cf93bbf67 100644
--- a/linphone-desktop/CMakeLists.txt
+++ b/linphone-desktop/CMakeLists.txt
@@ -95,7 +95,7 @@ set(SOURCES
   src/app/providers/ThumbnailProvider.cpp
   src/app/translator/DefaultTranslator.cpp
   src/components/assistant/AssistantModel.cpp
-  src/components/authentication/Authentication.cpp
+  src/components/authentication/AuthenticationNotifier.cpp
   src/components/call/CallModel.cpp
   src/components/calls/CallsListModel.cpp
   src/components/camera/Camera.cpp
@@ -135,7 +135,7 @@ set(HEADERS
   src/app/providers/ThumbnailProvider.hpp
   src/app/translator/DefaultTranslator.hpp
   src/components/assistant/AssistantModel.hpp
-  src/components/authentication/Authentication.hpp
+  src/components/authentication/AuthenticationNotifier.hpp
   src/components/call/CallModel.hpp
   src/components/calls/CallsListModel.hpp
   src/components/camera/Camera.hpp
diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts
index 142d27205..7e957001b 100644
--- a/linphone-desktop/assets/languages/en.ts
+++ b/linphone-desktop/assets/languages/en.ts
@@ -170,7 +170,7 @@
         <translation>Password</translation>
     </message>
     <message>
-        <source>authentificationRequestDescription</source>
+        <source>authenticationRequestDescription</source>
         <translation>Unable to authenticate. Please verify your password.</translation>
     </message>
     <message>
diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts
index 3c307c97c..5049e8322 100644
--- a/linphone-desktop/assets/languages/fr.ts
+++ b/linphone-desktop/assets/languages/fr.ts
@@ -170,7 +170,7 @@
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <source>authentificationRequestDescription</source>
+        <source>authenticationRequestDescription</source>
         <translation>Impossible de vous authentifier. Merci de vérifier votre mot de passe.</translation>
     </message>
     <message>
diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp
index 1f516be4b..ad0411b5d 100644
--- a/linphone-desktop/src/app/App.cpp
+++ b/linphone-desktop/src/app/App.cpp
@@ -292,7 +292,7 @@ void App::registerTypes () {
   qInfo() << "Registering types...";
 
   qmlRegisterType<AssistantModel>("Linphone", 1, 0, "AssistantModel");
-  qmlRegisterType<Authentication>("Linphone", 1, 0, "Authentication");
+  qmlRegisterType<AuthenticationNotifier>("Linphone", 1, 0, "AuthenticationNotifier");
   qmlRegisterType<Camera>("Linphone", 1, 0, "Camera");
   qmlRegisterType<CameraPreview>("Linphone", 1, 0, "CameraPreview");
   qmlRegisterType<ChatModel>("Linphone", 1, 0, "ChatModel");
diff --git a/linphone-desktop/src/components/Components.hpp b/linphone-desktop/src/components/Components.hpp
index cffeea0d9..a3eb68289 100644
--- a/linphone-desktop/src/components/Components.hpp
+++ b/linphone-desktop/src/components/Components.hpp
@@ -24,7 +24,7 @@
 #define COMPONENTS_H_
 
 #include "assistant/AssistantModel.hpp"
-#include "authentication/Authentication.hpp"
+#include "authentication/AuthenticationNotifier.hpp"
 #include "calls/CallsListModel.hpp"
 #include "camera/Camera.hpp"
 #include "camera/CameraPreview.hpp"
diff --git a/linphone-desktop/src/components/authentication/Authentication.cpp b/linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp
similarity index 82%
rename from linphone-desktop/src/components/authentication/Authentication.cpp
rename to linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp
index fa2af8712..a1e3f0943 100644
--- a/linphone-desktop/src/components/authentication/Authentication.cpp
+++ b/linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Authentication.cpp
+ * AuthenticationNotifier.cpp
  * Copyright (C) 2017  Belledonne Communications, Grenoble, France
  *
  * This program is free software; you can redistribute it and/or
@@ -23,20 +23,20 @@
 #include "../../Utils.hpp"
 #include "../core/CoreManager.hpp"
 
-#include "Authentication.hpp"
+#include "AuthenticationNotifier.hpp"
 
 using namespace std;
 
 // =============================================================================
 
-Authentication::Authentication (QObject *parent) : QObject(parent) {
+AuthenticationNotifier::AuthenticationNotifier (QObject *parent) : QObject(parent) {
   QObject::connect(
     &(*CoreManager::getInstance()->getHandlers()), &CoreHandlers::authenticationRequested,
-    this, &Authentication::handleAuthenticationRequested
+    this, &AuthenticationNotifier::handleAuthenticationRequested
   );
 }
 
-void Authentication::handleAuthenticationRequested (const shared_ptr<linphone::AuthInfo> &authInfo) {
+void AuthenticationNotifier::handleAuthenticationRequested (const shared_ptr<linphone::AuthInfo> &authInfo) {
   emit authenticationRequested(
     QVariant::fromValue(authInfo),
     ::Utils::linphoneStringToQString(authInfo->getRealm()),
diff --git a/linphone-desktop/src/components/authentication/Authentication.hpp b/linphone-desktop/src/components/authentication/AuthenticationNotifier.hpp
similarity index 82%
rename from linphone-desktop/src/components/authentication/Authentication.hpp
rename to linphone-desktop/src/components/authentication/AuthenticationNotifier.hpp
index 6798514fe..f686ae5d4 100644
--- a/linphone-desktop/src/components/authentication/Authentication.hpp
+++ b/linphone-desktop/src/components/authentication/AuthenticationNotifier.hpp
@@ -1,5 +1,5 @@
 /*
- * Authentication.hpp
+ * AuthenticationNotifier.hpp
  * Copyright (C) 2017  Belledonne Communications, Grenoble, France
  *
  * This program is free software; you can redistribute it and/or
@@ -20,21 +20,21 @@
  *      Author: Ronan Abhamon
  */
 
-#ifndef AUTHENTICATION_H_
-#define AUTHENTICATION_H_
+#ifndef AUTHENTICATION_NOTIFIER_H_
+#define AUTHENTICATION_NOTIFIER_H_
 
 #include <linphone++/linphone.hh>
 #include <QObject>
 
 // =============================================================================
 
-class Authentication : public QObject {
+class AuthenticationNotifier : public QObject {
   Q_OBJECT;
 
 public:
-  Authentication (QObject *parent = Q_NULLPTR);
+  AuthenticationNotifier (QObject *parent = Q_NULLPTR);
 
-  ~Authentication () = default;
+  ~AuthenticationNotifier () = default;
 
 signals:
   void authenticationRequested (const QVariant &authInfo, const QString &realm, const QString &sipAddress, const QString &userId);
@@ -45,4 +45,4 @@ private:
 
 Q_DECLARE_METATYPE(std::shared_ptr<linphone::AuthInfo> );
 
-#endif // AUTHENTICATION_H_
+#endif // AUTHENTICATION_NOTIFIER_H_
diff --git a/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml b/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml
index d231c7fc1..cfec6d8a8 100644
--- a/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml
+++ b/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml
@@ -35,7 +35,7 @@ DialogPlus {
   ]
 
   centeredButtons: true
-  descriptionText: qsTr('authentificationRequestDescription')
+  descriptionText: qsTr('authenticationRequestDescription')
 
   height: AuthenticationRequestStyle.height
   width: AuthenticationRequestStyle.width
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml
index 9889449ab..4d84cebfe 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml
@@ -87,7 +87,7 @@ ApplicationWindow {
 
       // -----------------------------------------------------------------------
 
-      Authentication {
+      AuthenticationNotifier {
         onAuthenticationRequested: Logic.handleAuthenticationRequested(authInfo, realm, sipAddress, userId)
       }