diff --git a/lib/ui/routes/main_route/smartphone_route.dart b/lib/ui/routes/main_route/smartphone_route.dart
index 15d7346..e204148 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/navbar_widget.dart';
+import 'package:comunic/ui/widgets/mobile_mode/mobile_navbar_widget.dart';
 import 'package:comunic/utils/account_utils.dart';
 import 'package:comunic/utils/intl_utils.dart';
 import 'package:comunic/utils/ui_utils.dart';
@@ -176,7 +176,7 @@ class _MainRouteState extends State<MainRoute> implements MainController {
           child: Scaffold(
             appBar: _currTab.hideNavBar
                 ? null
-                : ComunicAppBar(
+                : ComunicMobileAppBar(
                     onTap: _onTap,
                     selectedAction: _currTab.action,
                   ),
diff --git a/lib/ui/widgets/navbar_widget.dart b/lib/ui/widgets/mobile_mode/mobile_navbar_widget.dart
similarity index 96%
rename from lib/ui/widgets/navbar_widget.dart
rename to lib/ui/widgets/mobile_mode/mobile_navbar_widget.dart
index c329667..13d8bf8 100644
--- a/lib/ui/widgets/navbar_widget.dart
+++ b/lib/ui/widgets/mobile_mode/mobile_navbar_widget.dart
@@ -107,23 +107,23 @@ final _menuActionsItem = <_ActionMenuItem>[
 ];
 
 /// Public widget
-class ComunicAppBar extends StatefulWidget implements PreferredSizeWidget {
+class ComunicMobileAppBar extends StatefulWidget implements PreferredSizeWidget {
   final OnSelectMenuAction onTap;
   final BarCallbackActions selectedAction;
 
-  const ComunicAppBar(
+  const ComunicMobileAppBar(
       {Key key, @required this.onTap, @required this.selectedAction})
       : assert(onTap != null),
         super(key: key);
 
   @override
-  _ComunicAppBarState createState() => _ComunicAppBarState();
+  _ComunicMobileAppBarState createState() => _ComunicMobileAppBarState();
 
   @override
   Size get preferredSize => Size.fromHeight(40);
 }
 
-class _ComunicAppBarState extends SafeState<ComunicAppBar> {
+class _ComunicMobileAppBarState extends SafeState<ComunicMobileAppBar> {
   var _unreadNotifications =
       CountUnreadNotifications(notifications: 0, conversations: 0);