diff --git a/project/backend/ui.c b/project/backend/ui.c
index 15d7a79..d5a5d24 100644
--- a/project/backend/ui.c
+++ b/project/backend/ui.c
@@ -14,7 +14,7 @@ typedef enum {
 } FP_Scene;
 
 /* Types of Views */
-typedef enum { FP_View_Menu, FP_View_Popup } FP_View;
+typedef enum { FP_View_Submenu, FP_View_Popup } FP_View;
 
 /* All events */
 typedef enum {
@@ -49,51 +49,47 @@ void FP_Scene_Enter_MainMenu(void* context) {
     FP_App* app = context;
 
     // Reset menu for next draw
-    menu_reset(app->menu);
+    submenu_reset(app->submenu);
 
     // Adding items to menu
-    menu_add_item(
-        app->menu,
+    submenu_add_item(
+        app->submenu,
         "View Passwords",
-        NULL,
         FP_Scene_MainMenu_Event_View,
         FP_Scene_Callback_MainMenu,
         app
     );
-    menu_add_item(
-        app->menu,
+    submenu_add_item(
+        app->submenu,
         "Create Password",
-        NULL,
         FP_Scene_MainMenu_Event_Create,
         FP_Scene_Callback_MainMenu,
         app
     );
-    menu_add_item(
-        app->menu,
+    submenu_add_item(
+        app->submenu,
         "Archive Actions",
-        NULL,
         FP_Scene_MainMenu_Event_Archive,
         FP_Scene_Callback_MainMenu,
         app
     );
-    menu_add_item(
-        app->menu,
+    submenu_add_item(
+        app->submenu,
         "About",
-        NULL,
         FP_Scene_MainMenu_Event_About,
         FP_Scene_Callback_MainMenu,
         app
     );
 
     // Switching to current view
-    view_dispatcher_switch_to_view(app->view_dispatcher, FP_View_Menu);
+    view_dispatcher_switch_to_view(app->view_dispatcher, FP_View_Submenu);
 }
 void FP_Scene_Exit_MainMenu(void* context) {
     // Setting context
     FP_App* app = context;
 
     // Reset menu
-    menu_reset(app->menu);
+    submenu_reset(app->submenu);
 }
 bool FP_Scene_Event_MainMenu(void* context, SceneManagerEvent event) {
     // Setting context
@@ -174,7 +170,7 @@ FP_App* fp_app_create() {
     view_dispatcher_enable_queue(result->view_dispatcher);
 
     // Allocating all types of views
-    result->menu = menu_alloc();
+    result->submenu = submenu_alloc();
     result->popup = popup_alloc();
 
     // Event handling
@@ -183,7 +179,7 @@ FP_App* fp_app_create() {
     view_dispatcher_set_navigation_event_callback(result->view_dispatcher, FP_SceneManager_Callback_Navigation);
 
     // Adding views to dispatcher
-    view_dispatcher_add_view(result->view_dispatcher, FP_View_Menu, menu_get_view(result->menu));
+    view_dispatcher_add_view(result->view_dispatcher, FP_View_Submenu, submenu_get_view(result->submenu));
     view_dispatcher_add_view(result->view_dispatcher, FP_View_Popup, popup_get_view(result->popup));
 
     // Return app
@@ -210,10 +206,10 @@ void fp_app_run(FP_App* app) {
 void fp_app_delete(FP_App* app) {
     // Freeing stuff from memory
     scene_manager_free(app->scene_manager);
-    view_dispatcher_remove_view(app->view_dispatcher, FP_View_Menu);
+    view_dispatcher_remove_view(app->view_dispatcher, FP_View_Submenu);
     view_dispatcher_remove_view(app->view_dispatcher, FP_View_Popup);
     view_dispatcher_free(app->view_dispatcher);
-    menu_free(app->menu);
+    submenu_free(app->submenu);
     popup_free(app->popup);
     free(app);
 }
\ No newline at end of file
diff --git a/project/backend/ui.h b/project/backend/ui.h
index e3cac66..dafcef2 100644
--- a/project/backend/ui.h
+++ b/project/backend/ui.h
@@ -10,7 +10,7 @@
 #include <gui/scene_manager.h>
 #include <gui/view_dispatcher.h>
 
-#include <gui/modules/menu.h>
+#include <gui/modules/submenu.h>
 #include <gui/modules/popup.h>
 
 #include "app.h"
@@ -20,7 +20,7 @@
 typedef struct {
     SceneManager* scene_manager;
     ViewDispatcher* view_dispatcher;
-    Menu* menu;
+    Submenu* submenu;
     Popup* popup;
 } FP_App;