diff --git a/lib/ui/routes/main_route/smartphone_route.dart b/lib/ui/routes/main_route/smartphone_route.dart
index e204148..01ddfa8 100644
--- a/lib/ui/routes/main_route/smartphone_route.dart
+++ b/lib/ui/routes/main_route/smartphone_route.dart
@@ -14,7 +14,7 @@ import 'package:comunic/ui/screens/other_friends_lists_screen.dart';
 import 'package:comunic/ui/screens/search_screen.dart';
 import 'package:comunic/ui/screens/user_access_denied_screen.dart';
 import 'package:comunic/ui/screens/user_page_screen.dart';
-import 'package:comunic/ui/widgets/mobile_mode/mobile_navbar_widget.dart';
+import 'package:comunic/ui/widgets/mobile_mode/mobile_appbar_widget.dart';
 import 'package:comunic/utils/account_utils.dart';
 import 'package:comunic/utils/intl_utils.dart';
 import 'package:comunic/utils/ui_utils.dart';
diff --git a/lib/ui/routes/main_route/tablet_route.dart b/lib/ui/routes/main_route/tablet_route.dart
index 61ad585..647a0cc 100644
--- a/lib/ui/routes/main_route/tablet_route.dart
+++ b/lib/ui/routes/main_route/tablet_route.dart
@@ -1,7 +1,7 @@
 import 'package:comunic/ui/routes/main_route/main_route.dart';
 import 'package:comunic/ui/widgets/tablet_mode/current_user_panel.dart';
 import 'package:comunic/ui/widgets/tablet_mode/memberships_panel.dart';
-import 'package:comunic/ui/widgets/tablet_mode/tablet_navbar_widget.dart';
+import 'package:comunic/ui/widgets/tablet_mode/tablet_appbar_widget.dart';
 import 'package:flutter/material.dart';
 
 /// Main tablet route
@@ -22,7 +22,7 @@ class _TabletRouteState extends State<TabletRoute> {
     );
   }
 
-  Widget _buildAppBar() => ComunicTabletNavbarWidget();
+  Widget _buildAppBar() => ComunicTabletAppBarWidget();
 
   Widget _buildBody() => Row(
         children: <Widget>[_buildLeftPane(), _buildRightPane()],
diff --git a/lib/ui/widgets/mobile_mode/mobile_navbar_widget.dart b/lib/ui/widgets/mobile_mode/mobile_appbar_widget.dart
similarity index 100%
rename from lib/ui/widgets/mobile_mode/mobile_navbar_widget.dart
rename to lib/ui/widgets/mobile_mode/mobile_appbar_widget.dart
diff --git a/lib/ui/widgets/tablet_mode/tablet_navbar_widget.dart b/lib/ui/widgets/tablet_mode/tablet_appbar_widget.dart
similarity index 86%
rename from lib/ui/widgets/tablet_mode/tablet_navbar_widget.dart
rename to lib/ui/widgets/tablet_mode/tablet_appbar_widget.dart
index 33cba1e..985f03d 100644
--- a/lib/ui/widgets/tablet_mode/tablet_navbar_widget.dart
+++ b/lib/ui/widgets/tablet_mode/tablet_appbar_widget.dart
@@ -5,22 +5,22 @@ import 'package:comunic/ui/widgets/icon_button_badge.dart';
 import 'package:comunic/ui/widgets/safe_state.dart';
 import 'package:flutter/material.dart';
 
-/// Comunic tablet navbar widget
+/// Comunic tablet AppBar widget
 ///
 /// @author Pierre Hubert
 
-class ComunicTabletNavbarWidget extends StatefulWidget
+class ComunicTabletAppBarWidget extends StatefulWidget
     implements PreferredSizeWidget {
   @override
-  _ComunicTabletNavbarWidgetState createState() =>
-      _ComunicTabletNavbarWidgetState();
+  _ComunicTabletAppBarWidgetState createState() =>
+      _ComunicTabletAppBarWidgetState();
 
   @override
   Size get preferredSize => Size.fromHeight(kToolbarHeight);
 }
 
-class _ComunicTabletNavbarWidgetState
-    extends SafeState<ComunicTabletNavbarWidget> {
+class _ComunicTabletAppBarWidgetState
+    extends SafeState<ComunicTabletAppBarWidget> {
   var _unreadNotifications =
       CountUnreadNotifications(notifications: 0, conversations: 0);